From fe137a766144f7be1e3d73ce0cf06126584d84d0 Mon Sep 17 00:00:00 2001
From: Jacob Aronoff <jacobaronoff45@gmail.com>
Date: Thu, 19 Dec 2024 11:58:56 -0500
Subject: [PATCH 1/3] Chlog for release
---
.chloggen/discovering-target-async.yaml | 21 ----
.../fix-metrics-service-address-env-var.yaml | 18 ----
...apache-instrumentation-with-lifecycle.yaml | 16 ---
.chloggen/fix_remove-optional-resources.yaml | 16 ---
CHANGELOG.md | 33 ++++++
RELEASE.md | 2 +-
autoinstrumentation/python/requirements.txt | 102 +++++++++---------
...emetry-operator.clusterserviceversion.yaml | 8 +-
...emetry-operator.clusterserviceversion.yaml | 8 +-
docs/compatibility.md | 4 +-
versions.txt | 14 +--
11 files changed, 102 insertions(+), 140 deletions(-)
delete mode 100755 .chloggen/discovering-target-async.yaml
delete mode 100644 .chloggen/fix-metrics-service-address-env-var.yaml
delete mode 100755 .chloggen/fix_apache-instrumentation-with-lifecycle.yaml
delete mode 100755 .chloggen/fix_remove-optional-resources.yaml
diff --git a/.chloggen/discovering-target-async.yaml b/.chloggen/discovering-target-async.yaml
deleted file mode 100755
index e2291628c6..0000000000
--- a/.chloggen/discovering-target-async.yaml
+++ /dev/null
@@ -1,21 +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. collector, target allocator, auto-instrumentation, opamp, github action)
-component: target allocator
-
-# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Process discovered targets asyncchronously
-
-# One or more tracking issues related to the change
-issues: [1842]
-
-# (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: |
- This change enables the target allocator to process discovered targets asynchronously.
- This is a significant performance improvement for the target allocator, as it allows it to process targets in parallel, rather than sequentially.
- This change also introduces new metrics to track the performance of the target allocator.
- - opentelemetry_allocator_process_targets_duration_seconds: The duration of the process targets operation.
- - opentelemetry_allocator_process_target_groups_duration_seconds: The duration of the process target groups operation.
diff --git a/.chloggen/fix-metrics-service-address-env-var.yaml b/.chloggen/fix-metrics-service-address-env-var.yaml
deleted file mode 100644
index aaaaabaca9..0000000000
--- a/.chloggen/fix-metrics-service-address-env-var.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: bug_fix
-
-# 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: operator
-
-# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Fix the admission webhook to when metrics service address host uses env var expansion
-
-# One or more tracking issues related to the change
-issues: [3513]
-
-# (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: |
- This should allow the metrics service address to have the host portion expanded from an environment variable,
- like `$(env:POD_IP)` instead of using `0.0.0.0`, which is the [recommended by the Collector](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks).
diff --git a/.chloggen/fix_apache-instrumentation-with-lifecycle.yaml b/.chloggen/fix_apache-instrumentation-with-lifecycle.yaml
deleted file mode 100755
index f3820581f0..0000000000
--- a/.chloggen/fix_apache-instrumentation-with-lifecycle.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: bug_fix
-
-# 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: Apache instrumentation sidecar fails to start if target container define lifecycle
-
-# One or more tracking issues related to the change
-issues: [3547]
-
-# (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/fix_remove-optional-resources.yaml b/.chloggen/fix_remove-optional-resources.yaml
deleted file mode 100755
index f5f73cf935..0000000000
--- a/.chloggen/fix_remove-optional-resources.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: bug_fix
-
-# 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: collector
-
-# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Fix deletion of optional resources for OpenTelemetryCollector CRs
-
-# One or more tracking issues related to the change
-issues: [3454]
-
-# (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 9ad2463844..05a2cb6ac6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,39 @@
<!-- next version -->
+## 0.116.0
+
+### 💡 Enhancements 💡
+
+- `target allocator`: Process discovered targets asyncchronously (#1842)
+ This change enables the target allocator to process discovered targets asynchronously.
+ This is a significant performance improvement for the target allocator, as it allows it to process targets in parallel, rather than sequentially.
+ This change also introduces new metrics to track the performance of the target allocator.
+ - opentelemetry_allocator_process_targets_duration_seconds: The duration of the process targets operation.
+ - opentelemetry_allocator_process_target_groups_duration_seconds: The duration of the process target groups operation.
+
+
+### 🧰 Bug fixes 🧰
+
+- `operator`: Fix the admission webhook to when metrics service address host uses env var expansion (#3513)
+ This should allow the metrics service address to have the host portion expanded from an environment variable,
+ like `$(env:POD_IP)` instead of using `0.0.0.0`, which is the [recommended by the Collector](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/security-best-practices.md#safeguards-against-denial-of-service-attacks).
+
+- `auto-instrumentation`: Apache instrumentation sidecar fails to start if target container define lifecycle (#3547)
+- `collector`: Fix deletion of optional resources for OpenTelemetryCollector CRs (#3454)
+
+### Components
+
+* [OpenTelemetry Collector - v0.116.1](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.116.1)
+* [OpenTelemetry Contrib - v0.116.1](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.116.1)
+* [Java auto-instrumentation - v1.33.5](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.5)
+* [.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.50b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.50b0)
+* [Go - v0.19.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.19.0-alpha)
+* [ApacheHTTPD - 1.1.0](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.1.0)
+* [Nginx - 1.1.0](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.1.0)
+
## 0.115.0
### 💡 Enhancements 💡
diff --git a/RELEASE.md b/RELEASE.md
index bcd5c4dd2c..9ec7ea1a51 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -44,10 +44,10 @@ The operator should be released within a week after the [OpenTelemetry collector
| Version | Release manager |
|----------|-----------------|
-| v0.116.0 | @jaronoff97 |
| v0.117.0 | @iblancasa |
| v0.118.0 | @frzifus |
| v0.119.0 | @yuriolisa |
| v0.120.0 | @pavolloffay |
| v0.121.0 | @swiatekm |
| v0.122.0 | @TylerHelmuth |
+| v0.123.0 | @jaronoff97 |
diff --git a/autoinstrumentation/python/requirements.txt b/autoinstrumentation/python/requirements.txt
index 8f5a3b84dc..c5a525a22f 100644
--- a/autoinstrumentation/python/requirements.txt
+++ b/autoinstrumentation/python/requirements.txt
@@ -1,61 +1,61 @@
-opentelemetry-distro==0.48b0
+opentelemetry-distro==0.50b0
# We don't use the distro[otlp] option which automatically includes exporters since gRPC is not appropriate for
# injected auto-instrumentation, where it has a strict dependency on the OS / Python version the artifact is built for.
opentelemetry-exporter-otlp-proto-http==1.27.0
-opentelemetry-exporter-prometheus==0.48b0
+opentelemetry-exporter-prometheus==0.50b0
opentelemetry-propagator-b3==1.27.0
opentelemetry-propagator-jaeger==1.27.0
opentelemetry-propagator-aws-xray==1.0.2
-opentelemetry-instrumentation==0.48b0
-opentelemetry-propagator-ot-trace==0.48b0
+opentelemetry-instrumentation==0.50b0
+opentelemetry-propagator-ot-trace==0.50b0
# Copied in from https://github.com/open-telemetry/opentelemetry-python-contrib/tree/main/instrumentation
-opentelemetry-instrumentation-aio-pika==0.48b0
-opentelemetry-instrumentation-aiohttp-client==0.48b0
-opentelemetry-instrumentation-aiohttp-server==0.48b0
-opentelemetry-instrumentation-aiopg==0.48b0
-opentelemetry-instrumentation-asgi==0.48b0
-opentelemetry-instrumentation-asyncio==0.48b0
-opentelemetry-instrumentation-asyncpg==0.48b0
-opentelemetry-instrumentation-aws-lambda==0.48b0
-opentelemetry-instrumentation-boto==0.48b0
-opentelemetry-instrumentation-boto3sqs==0.48b0
-opentelemetry-instrumentation-botocore==0.48b0
-opentelemetry-instrumentation-cassandra==0.48b0
-opentelemetry-instrumentation-celery==0.48b0
-opentelemetry-instrumentation-confluent-kafka==0.48b0
-opentelemetry-instrumentation-dbapi==0.48b0
-opentelemetry-instrumentation-django==0.48b0
-opentelemetry-instrumentation-elasticsearch==0.48b0
-opentelemetry-instrumentation-falcon==0.48b0
-opentelemetry-instrumentation-fastapi==0.48b0
-opentelemetry-instrumentation-flask==0.48b0
-opentelemetry-instrumentation-grpc==0.48b0
-opentelemetry-instrumentation-httpx==0.48b0
-opentelemetry-instrumentation-jinja2==0.48b0
-opentelemetry-instrumentation-kafka-python==0.48b0
-opentelemetry-instrumentation-logging==0.48b0
-opentelemetry-instrumentation-mysql==0.48b0
-opentelemetry-instrumentation-mysqlclient==0.48b0
-opentelemetry-instrumentation-pika==0.48b0
-opentelemetry-instrumentation-psycopg==0.48b0
-opentelemetry-instrumentation-psycopg2==0.48b0
-opentelemetry-instrumentation-pymemcache==0.48b0
-opentelemetry-instrumentation-pymongo==0.48b0
-opentelemetry-instrumentation-pymysql==0.48b0
-opentelemetry-instrumentation-pyramid==0.48b0
-opentelemetry-instrumentation-redis==0.48b0
-opentelemetry-instrumentation-remoulade==0.48b0
-opentelemetry-instrumentation-requests==0.48b0
-opentelemetry-instrumentation-sqlalchemy==0.48b0
-opentelemetry-instrumentation-sqlite3==0.48b0
-opentelemetry-instrumentation-starlette==0.48b0
-opentelemetry-instrumentation-system-metrics==0.48b0
-opentelemetry-instrumentation-threading==0.48b0
-opentelemetry-instrumentation-tornado==0.48b0
-opentelemetry-instrumentation-tortoiseorm==0.48b0
-opentelemetry-instrumentation-urllib==0.48b0
-opentelemetry-instrumentation-urllib3==0.48b0
-opentelemetry-instrumentation-wsgi==0.48b0
+opentelemetry-instrumentation-aio-pika==0.50b0
+opentelemetry-instrumentation-aiohttp-client==0.50b0
+opentelemetry-instrumentation-aiohttp-server==0.50b0
+opentelemetry-instrumentation-aiopg==0.50b0
+opentelemetry-instrumentation-asgi==0.50b0
+opentelemetry-instrumentation-asyncio==0.50b0
+opentelemetry-instrumentation-asyncpg==0.50b0
+opentelemetry-instrumentation-aws-lambda==0.50b0
+opentelemetry-instrumentation-boto==0.50b0
+opentelemetry-instrumentation-boto3sqs==0.50b0
+opentelemetry-instrumentation-botocore==0.50b0
+opentelemetry-instrumentation-cassandra==0.50b0
+opentelemetry-instrumentation-celery==0.50b0
+opentelemetry-instrumentation-confluent-kafka==0.50b0
+opentelemetry-instrumentation-dbapi==0.50b0
+opentelemetry-instrumentation-django==0.50b0
+opentelemetry-instrumentation-elasticsearch==0.50b0
+opentelemetry-instrumentation-falcon==0.50b0
+opentelemetry-instrumentation-fastapi==0.50b0
+opentelemetry-instrumentation-flask==0.50b0
+opentelemetry-instrumentation-grpc==0.50b0
+opentelemetry-instrumentation-httpx==0.50b0
+opentelemetry-instrumentation-jinja2==0.50b0
+opentelemetry-instrumentation-kafka-python==0.50b0
+opentelemetry-instrumentation-logging==0.50b0
+opentelemetry-instrumentation-mysql==0.50b0
+opentelemetry-instrumentation-mysqlclient==0.50b0
+opentelemetry-instrumentation-pika==0.50b0
+opentelemetry-instrumentation-psycopg==0.50b0
+opentelemetry-instrumentation-psycopg2==0.50b0
+opentelemetry-instrumentation-pymemcache==0.50b0
+opentelemetry-instrumentation-pymongo==0.50b0
+opentelemetry-instrumentation-pymysql==0.50b0
+opentelemetry-instrumentation-pyramid==0.50b0
+opentelemetry-instrumentation-redis==0.50b0
+opentelemetry-instrumentation-remoulade==0.50b0
+opentelemetry-instrumentation-requests==0.50b0
+opentelemetry-instrumentation-sqlalchemy==0.50b0
+opentelemetry-instrumentation-sqlite3==0.50b0
+opentelemetry-instrumentation-starlette==0.50b0
+opentelemetry-instrumentation-system-metrics==0.50b0
+opentelemetry-instrumentation-threading==0.50b0
+opentelemetry-instrumentation-tornado==0.50b0
+opentelemetry-instrumentation-tortoiseorm==0.50b0
+opentelemetry-instrumentation-urllib==0.50b0
+opentelemetry-instrumentation-urllib3==0.50b0
+opentelemetry-instrumentation-wsgi==0.50b0
diff --git a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml
index 343e912f2c..3086cedb57 100644
--- a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml
+++ b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -99,13 +99,13 @@ metadata:
categories: Logging & Tracing,Monitoring
certified: "false"
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
- createdAt: "2024-12-10T17:11:22Z"
+ createdAt: "2024-12-19T16:56:26Z"
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.115.0
+ name: opentelemetry-operator.v0.116.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -483,7 +483,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.serviceAccountName
- image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.115.0
+ image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.116.0
livenessProbe:
httpGet:
path: /healthz
@@ -591,7 +591,7 @@ spec:
minKubeVersion: 1.23.0
provider:
name: OpenTelemetry Community
- version: 0.115.0
+ version: 0.116.0
webhookdefinitions:
- admissionReviewVersions:
- v1alpha1
diff --git a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml
index e17aa54cf3..ed82b5b7eb 100644
--- a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml
+++ b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -99,13 +99,13 @@ metadata:
categories: Logging & Tracing,Monitoring
certified: "false"
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
- createdAt: "2024-12-10T17:11:31Z"
+ createdAt: "2024-12-19T16:56:38Z"
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.115.0
+ name: opentelemetry-operator.v0.116.0
namespace: placeholder
spec:
apiservicedefinitions: {}
@@ -487,7 +487,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.serviceAccountName
- image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.115.0
+ image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.116.0
livenessProbe:
httpGet:
path: /healthz
@@ -606,7 +606,7 @@ spec:
minKubeVersion: 1.23.0
provider:
name: OpenTelemetry Community
- version: 0.115.0
+ version: 0.116.0
webhookdefinitions:
- admissionReviewVersions:
- v1alpha1
diff --git a/docs/compatibility.md b/docs/compatibility.md
index 743dfca46a..68f1686d53 100644
--- a/docs/compatibility.md
+++ b/docs/compatibility.md
@@ -46,6 +46,7 @@ The OpenTelemetry Operator _might_ work on versions outside of the given range,
| OpenTelemetry Operator | Kubernetes | Cert-Manager | Prometheus-Operator |
|------------------------|----------------|--------------|---------------------|
+| v0.116.0 | v1.23 to v1.31 | v1 | v0.76.2 |
| v0.115.0 | v1.23 to v1.31 | v1 | v0.76.0 |
| v0.114.0 | v1.23 to v1.31 | v1 | v0.76.0 |
| v0.113.0 | v1.23 to v1.31 | v1 | v0.76.0 |
@@ -69,8 +70,7 @@ The OpenTelemetry Operator _might_ work on versions outside of the given range,
| v0.95.0 | v1.23 to v1.29 | v1 | v0.71.2 |
| v0.94.0 | v1.23 to v1.29 | v1 | v0.71.0 |
| v0.93.0 | v1.23 to v1.29 | v1 | v0.71.0 |
-| v0.92.0 | v1.23 to v1.29 | v1 | v0.71.0 |
[kubernetes_releases]: https://kubernetes.io/releases/
[openshift_support]: https://access.redhat.com/support/policy/updates/openshift
-[aws_support]: https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html
\ No newline at end of file
+[aws_support]: https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html
diff --git a/versions.txt b/versions.txt
index 755bca2ed0..c4760f7d1c 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.115.1
+opentelemetry-collector=0.116.1
# Represents the current release of the OpenTelemetry Operator.
-operator=0.115.0
+operator=0.116.0
# Represents the current release of the Target Allocator.
-targetallocator=0.115.0
+targetallocator=0.116.0
# Represents the current release of the Operator OpAMP Bridge.
-operator-opamp-bridge=0.115.0
+operator-opamp-bridge=0.116.0
# Represents the current release of Java instrumentation.
# Should match autoinstrumentation/java/version.txt
@@ -23,7 +23,7 @@ autoinstrumentation-nodejs=0.53.0
# Represents the current release of Python instrumentation.
# Should match value in autoinstrumentation/python/requirements.txt
-autoinstrumentation-python=0.48b0
+autoinstrumentation-python=0.50b0
# Represents the current release of DotNet instrumentation.
# Should match autoinstrumentation/dotnet/version.txt
@@ -34,8 +34,8 @@ autoinstrumentation-go=v0.19.0-alpha
# Represents the current release of Apache HTTPD instrumentation.
# Should match autoinstrumentation/apache-httpd/version.txt
-autoinstrumentation-apache-httpd=1.0.4
+autoinstrumentation-apache-httpd=1.1.0
# Represents the current release of Apache Nginx instrumentation.
# Should match autoinstrumentation/apache-httpd/version.txt
-autoinstrumentation-nginx=1.0.4
+autoinstrumentation-nginx=1.1.0
From ef1fcfbb8dcb6e56706147132c72491a6d9a03b5 Mon Sep 17 00:00:00 2001
From: Jacob Aronoff <jacobaronoff45@gmail.com>
Date: Thu, 19 Dec 2024 12:05:51 -0500
Subject: [PATCH 2/3] fix some versions
---
autoinstrumentation/python/requirements.txt | 6 +++---
versions.txt | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/autoinstrumentation/python/requirements.txt b/autoinstrumentation/python/requirements.txt
index c5a525a22f..1d579f620f 100644
--- a/autoinstrumentation/python/requirements.txt
+++ b/autoinstrumentation/python/requirements.txt
@@ -1,11 +1,11 @@
opentelemetry-distro==0.50b0
# We don't use the distro[otlp] option which automatically includes exporters since gRPC is not appropriate for
# injected auto-instrumentation, where it has a strict dependency on the OS / Python version the artifact is built for.
-opentelemetry-exporter-otlp-proto-http==1.27.0
+opentelemetry-exporter-otlp-proto-http==1.29.0
opentelemetry-exporter-prometheus==0.50b0
-opentelemetry-propagator-b3==1.27.0
-opentelemetry-propagator-jaeger==1.27.0
+opentelemetry-propagator-b3==1.29.0
+opentelemetry-propagator-jaeger==1.29.0
opentelemetry-propagator-aws-xray==1.0.2
opentelemetry-instrumentation==0.50b0
diff --git a/versions.txt b/versions.txt
index c4760f7d1c..befd12a5e4 100644
--- a/versions.txt
+++ b/versions.txt
@@ -34,8 +34,8 @@ autoinstrumentation-go=v0.19.0-alpha
# Represents the current release of Apache HTTPD instrumentation.
# Should match autoinstrumentation/apache-httpd/version.txt
-autoinstrumentation-apache-httpd=1.1.0
+autoinstrumentation-apache-httpd=1.0.4
# Represents the current release of Apache Nginx instrumentation.
# Should match autoinstrumentation/apache-httpd/version.txt
-autoinstrumentation-nginx=1.1.0
+autoinstrumentation-nginx=1.0.4
From 2bebafe37e04c253fc44cca1a9915fa1ca9a5302 Mon Sep 17 00:00:00 2001
From: Jacob Aronoff <jacobaronoff45@gmail.com>
Date: Thu, 19 Dec 2024 14:29:28 -0500
Subject: [PATCH 3/3] bump version
---
versions.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/versions.txt b/versions.txt
index befd12a5e4..77231fe753 100644
--- a/versions.txt
+++ b/versions.txt
@@ -15,7 +15,7 @@ operator-opamp-bridge=0.116.0
# Represents the current release of Java instrumentation.
# Should match autoinstrumentation/java/version.txt
-autoinstrumentation-java=1.33.5
+autoinstrumentation-java=1.33.6
# Represents the current release of NodeJS instrumentation.
# Should match value in autoinstrumentation/nodejs/package.json