From 09f606fab1b41bfd241358d73cc1d75157f95e74 Mon Sep 17 00:00:00 2001 From: Mitali Salvi Date: Wed, 22 May 2024 16:28:18 -0400 Subject: [PATCH 1/5] Updated release notes for 1.4.0 --- RELEASE_NOTES | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 2ea54ae3e..7128f8e01 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,3 +1,11 @@ +======================================================================== +Amazon CloudWatch Agent Operator v1.4.0 (2024-05-22) +======================================================================== +Enhancements: +* [ContainerInsights] Add status handlers for Neuron and DCGM resources to reduce logging (#169) +* [ApplicationSignals] Support application_signals instead of app_signals (#172) +* [ContainerInsights] Support tolerations for Neuron and DCGM custom resources (#175) + ======================================================================== Amazon CloudWatch Agent Operator v1.3.1 (2024-04-24) ======================================================================== From b34abed9fdb0ff6d320a208150e7fe68f3f543bb Mon Sep 17 00:00:00 2001 From: Mitali Salvi Date: Wed, 22 May 2024 16:32:04 -0400 Subject: [PATCH 2/5] Updating versions --- versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/versions.txt b/versions.txt index eb65bd2b1..46fdbe57f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,12 +1,12 @@ # Represents the latest stable release of the CloudWatch Agent -cloudwatch-agent=1.300037.0b583 +cloudwatch-agent=1.300040.0 # Represents the current release of the CloudWatch Agent Operator. -operator=1.3.1 +operator=1.4.0 # Represents the current release of ADOT language instrumentation. -aws-otel-java-instrumentation=v1.32.1 -aws-otel-python-instrumentation=v0.1.1 +aws-otel-java-instrumentation=v1.32.2 +aws-otel-python-instrumentation=v0.2.0 dcgm-exporter=3.3.3-3.3.1-ubuntu22.04 neuron-monitor=1.0.0 \ No newline at end of file From 4ccff01e4ef00c4d5e12a12aed0afe04603db23a Mon Sep 17 00:00:00 2001 From: Mitali Salvi Date: Wed, 22 May 2024 16:47:42 -0400 Subject: [PATCH 3/5] updating agent hash --- ..._instrumentation_dotnet_env_variables.json | 17 ++++++++++++++ .../dotnet/sample-deployment-dotnet.yaml | 20 +++++++++++++++++ ...rumentation_python-java_env_variables.json | 19 ++++++++++++++++ .../sample-deployment-multi-language.yaml | 22 +++++++++++++++++++ versions.txt | 2 +- 5 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 integration-tests/dotnet/default_instrumentation_dotnet_env_variables.json create mode 100644 integration-tests/dotnet/sample-deployment-dotnet.yaml create mode 100644 integration-tests/multi-language-combined/default_instrumentation_python-java_env_variables.json create mode 100644 integration-tests/multi-language-combined/sample-deployment-multi-language.yaml diff --git a/integration-tests/dotnet/default_instrumentation_dotnet_env_variables.json b/integration-tests/dotnet/default_instrumentation_dotnet_env_variables.json new file mode 100644 index 000000000..206ff791a --- /dev/null +++ b/integration-tests/dotnet/default_instrumentation_dotnet_env_variables.json @@ -0,0 +1,17 @@ +{ + "OTEL_AWS_APP_SIGNALS_ENABLED": true, + "OTEL_TRACES_SAMPLER_ARG": "endpoint=http://cloudwatch-agent.amazon-cloudwatch:2000", + "OTEL_TRACES_SAMPLER": "xray", + "OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf", + "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/traces", + "OTEL_AWS_APP_SIGNALS_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics", + "OTEL_METRICS_EXPORTER": "none", + "OTEL_PYTHON_DISTRO": "aws_distro", + "OTEL_PYTHON_CONFIGURATOR": "aws_configurator", + "OTEL_LOGS_EXPORTER": "none", + "CORECLR_PROFILER_PATH": "/otel-auto-instrumentation-dotnet/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so", + "DOTNET_STARTUP_HOOKS": "/otel-auto-instrumentation-dotnet/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll", + "DOTNET_ADDITIONAL_DEPS": "/otel-auto-instrumentation-dotnet/AdditionalDeps", + "OTEL_DOTNET_AUTO_HOME": "/otel-auto-instrumentation-dotnet", + "DOTNET_SHARED_STORE": "/otel-auto-instrumentation-dotnet/store", +} \ No newline at end of file diff --git a/integration-tests/dotnet/sample-deployment-dotnet.yaml b/integration-tests/dotnet/sample-deployment-dotnet.yaml new file mode 100644 index 000000000..efd993bee --- /dev/null +++ b/integration-tests/dotnet/sample-deployment-dotnet.yaml @@ -0,0 +1,20 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx +spec: + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + annotations: + instrumentation.opentelemetry.io/inject-dotnet: "true" + spec: + containers: + - name: nginx + image: nginx:1.14.2 + restartPolicy: Always +status: {} \ No newline at end of file diff --git a/integration-tests/multi-language-combined/default_instrumentation_python-java_env_variables.json b/integration-tests/multi-language-combined/default_instrumentation_python-java_env_variables.json new file mode 100644 index 000000000..6588c61d1 --- /dev/null +++ b/integration-tests/multi-language-combined/default_instrumentation_python-java_env_variables.json @@ -0,0 +1,19 @@ + +{ + "PYTHONPATH": "/otel-auto-instrumentation-python/opentelemetry/instrumentation/auto_instrumentation:/otel-auto-instrumentation-python", + "OTEL_AWS_APP_SIGNALS_ENABLED": "true", + "OTEL_TRACES_SAMPLER_ARG": "endpoint=http://cloudwatch-agent.amazon-cloudwatch:2000", + "OTEL_TRACES_SAMPLER": "xray", + "OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf", + "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/traces", + "OTEL_AWS_APP_SIGNALS_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics", + "OTEL_METRICS_EXPORTER": "none", + "OTEL_PYTHON_DISTRO": "aws_distro", + "OTEL_PYTHON_CONFIGURATOR": "aws_configurator", + "OTEL_SMP_ENABLED": "true", + "OTEL_AWS_SMP_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics", + "JAVA_TOOL_OPTIONS": "-javaagent:/otel-auto-instrumentation-java/javaagent.jar", + "DOTNET_ADDITIONAL_DEPS": "/otel-auto-instrumentation-dotnet/AdditionalDeps", + "OTEL_DOTNET_AUTO_HOME": "/otel-auto-instrumentation-dotnet", + "DOTNET_SHARED_STORE": "/otel-auto-instrumentation-dotnet/store" +} \ No newline at end of file diff --git a/integration-tests/multi-language-combined/sample-deployment-multi-language.yaml b/integration-tests/multi-language-combined/sample-deployment-multi-language.yaml new file mode 100644 index 000000000..c0c289b0d --- /dev/null +++ b/integration-tests/multi-language-combined/sample-deployment-multi-language.yaml @@ -0,0 +1,22 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: nginx +spec: + selector: + matchLabels: + app: nginx + template: + metadata: + labels: + app: nginx + annotations: + instrumentation.opentelemetry.io/inject-python: "true" + instrumentation.opentelemetry.io/inject-java: "true" + instrumentation.opentelemetry.io/inject-dotnet: "true" + spec: + containers: + - name: nginx + image: nginx:1.14.2 + restartPolicy: Always +status: {} \ No newline at end of file diff --git a/versions.txt b/versions.txt index 46fdbe57f..c7137e3ea 100644 --- a/versions.txt +++ b/versions.txt @@ -1,5 +1,5 @@ # Represents the latest stable release of the CloudWatch Agent -cloudwatch-agent=1.300040.0 +cloudwatch-agent=1.300040.0b650 # Represents the current release of the CloudWatch Agent Operator. operator=1.4.0 From e263fcf7f9480667017010fdf26a43bb235beb25 Mon Sep 17 00:00:00 2001 From: Mitali Salvi Date: Wed, 22 May 2024 16:48:20 -0400 Subject: [PATCH 4/5] Revert "updating agent hash" This reverts commit 4ccff01e4ef00c4d5e12a12aed0afe04603db23a. --- ..._instrumentation_dotnet_env_variables.json | 17 -------------- .../dotnet/sample-deployment-dotnet.yaml | 20 ----------------- ...rumentation_python-java_env_variables.json | 19 ---------------- .../sample-deployment-multi-language.yaml | 22 ------------------- versions.txt | 2 +- 5 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 integration-tests/dotnet/default_instrumentation_dotnet_env_variables.json delete mode 100644 integration-tests/dotnet/sample-deployment-dotnet.yaml delete mode 100644 integration-tests/multi-language-combined/default_instrumentation_python-java_env_variables.json delete mode 100644 integration-tests/multi-language-combined/sample-deployment-multi-language.yaml diff --git a/integration-tests/dotnet/default_instrumentation_dotnet_env_variables.json b/integration-tests/dotnet/default_instrumentation_dotnet_env_variables.json deleted file mode 100644 index 206ff791a..000000000 --- a/integration-tests/dotnet/default_instrumentation_dotnet_env_variables.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "OTEL_AWS_APP_SIGNALS_ENABLED": true, - "OTEL_TRACES_SAMPLER_ARG": "endpoint=http://cloudwatch-agent.amazon-cloudwatch:2000", - "OTEL_TRACES_SAMPLER": "xray", - "OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf", - "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/traces", - "OTEL_AWS_APP_SIGNALS_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics", - "OTEL_METRICS_EXPORTER": "none", - "OTEL_PYTHON_DISTRO": "aws_distro", - "OTEL_PYTHON_CONFIGURATOR": "aws_configurator", - "OTEL_LOGS_EXPORTER": "none", - "CORECLR_PROFILER_PATH": "/otel-auto-instrumentation-dotnet/linux-x64/OpenTelemetry.AutoInstrumentation.Native.so", - "DOTNET_STARTUP_HOOKS": "/otel-auto-instrumentation-dotnet/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll", - "DOTNET_ADDITIONAL_DEPS": "/otel-auto-instrumentation-dotnet/AdditionalDeps", - "OTEL_DOTNET_AUTO_HOME": "/otel-auto-instrumentation-dotnet", - "DOTNET_SHARED_STORE": "/otel-auto-instrumentation-dotnet/store", -} \ No newline at end of file diff --git a/integration-tests/dotnet/sample-deployment-dotnet.yaml b/integration-tests/dotnet/sample-deployment-dotnet.yaml deleted file mode 100644 index efd993bee..000000000 --- a/integration-tests/dotnet/sample-deployment-dotnet.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nginx -spec: - selector: - matchLabels: - app: nginx - template: - metadata: - labels: - app: nginx - annotations: - instrumentation.opentelemetry.io/inject-dotnet: "true" - spec: - containers: - - name: nginx - image: nginx:1.14.2 - restartPolicy: Always -status: {} \ No newline at end of file diff --git a/integration-tests/multi-language-combined/default_instrumentation_python-java_env_variables.json b/integration-tests/multi-language-combined/default_instrumentation_python-java_env_variables.json deleted file mode 100644 index 6588c61d1..000000000 --- a/integration-tests/multi-language-combined/default_instrumentation_python-java_env_variables.json +++ /dev/null @@ -1,19 +0,0 @@ - -{ - "PYTHONPATH": "/otel-auto-instrumentation-python/opentelemetry/instrumentation/auto_instrumentation:/otel-auto-instrumentation-python", - "OTEL_AWS_APP_SIGNALS_ENABLED": "true", - "OTEL_TRACES_SAMPLER_ARG": "endpoint=http://cloudwatch-agent.amazon-cloudwatch:2000", - "OTEL_TRACES_SAMPLER": "xray", - "OTEL_EXPORTER_OTLP_PROTOCOL": "http/protobuf", - "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/traces", - "OTEL_AWS_APP_SIGNALS_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics", - "OTEL_METRICS_EXPORTER": "none", - "OTEL_PYTHON_DISTRO": "aws_distro", - "OTEL_PYTHON_CONFIGURATOR": "aws_configurator", - "OTEL_SMP_ENABLED": "true", - "OTEL_AWS_SMP_EXPORTER_ENDPOINT": "http://cloudwatch-agent.amazon-cloudwatch:4316/v1/metrics", - "JAVA_TOOL_OPTIONS": "-javaagent:/otel-auto-instrumentation-java/javaagent.jar", - "DOTNET_ADDITIONAL_DEPS": "/otel-auto-instrumentation-dotnet/AdditionalDeps", - "OTEL_DOTNET_AUTO_HOME": "/otel-auto-instrumentation-dotnet", - "DOTNET_SHARED_STORE": "/otel-auto-instrumentation-dotnet/store" -} \ No newline at end of file diff --git a/integration-tests/multi-language-combined/sample-deployment-multi-language.yaml b/integration-tests/multi-language-combined/sample-deployment-multi-language.yaml deleted file mode 100644 index c0c289b0d..000000000 --- a/integration-tests/multi-language-combined/sample-deployment-multi-language.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nginx -spec: - selector: - matchLabels: - app: nginx - template: - metadata: - labels: - app: nginx - annotations: - instrumentation.opentelemetry.io/inject-python: "true" - instrumentation.opentelemetry.io/inject-java: "true" - instrumentation.opentelemetry.io/inject-dotnet: "true" - spec: - containers: - - name: nginx - image: nginx:1.14.2 - restartPolicy: Always -status: {} \ No newline at end of file diff --git a/versions.txt b/versions.txt index c7137e3ea..46fdbe57f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,5 +1,5 @@ # Represents the latest stable release of the CloudWatch Agent -cloudwatch-agent=1.300040.0b650 +cloudwatch-agent=1.300040.0 # Represents the current release of the CloudWatch Agent Operator. operator=1.4.0 From 75d08560ecf99f6fb1fafdfb42439f2a16534534 Mon Sep 17 00:00:00 2001 From: Mitali Salvi Date: Wed, 22 May 2024 16:49:04 -0400 Subject: [PATCH 5/5] updating agent hash --- versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.txt b/versions.txt index 46fdbe57f..c7137e3ea 100644 --- a/versions.txt +++ b/versions.txt @@ -1,5 +1,5 @@ # Represents the latest stable release of the CloudWatch Agent -cloudwatch-agent=1.300040.0 +cloudwatch-agent=1.300040.0b650 # Represents the current release of the CloudWatch Agent Operator. operator=1.4.0