Skip to content

Commit

Permalink
Disable custom jmx metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
ekremsekerci committed Feb 5, 2025
1 parent 379771a commit b333102
Showing 1 changed file with 20 additions and 9 deletions.
29 changes: 20 additions & 9 deletions buildpack/telemetry/datadog.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from buildpack import util
from buildpack.core import runtime
from buildpack.infrastructure import database
from buildpack.telemetry.metrics import deny_all_apm_metrics
from lib.m2ee.version import MXVersion
from lib.m2ee.util import strtobool

Expand Down Expand Up @@ -250,10 +251,15 @@ def _set_up_dd_java_agent(m2ee, model_version, runtime_version, jmx_config_files
)

# Extend with JMX options
dd_jmxfetch_enabled = "true"
if deny_all_apm_metrics():
logging.error("####### deny all is set, disabling jmx") ## todo: remove this
dd_jmxfetch_enabled = "false" ## todo: update to false

util.upsert_javaopts(
m2ee,
[
"-Ddd.jmxfetch.enabled=true",
f"-Ddd.jmxfetch.enabled={dd_jmxfetch_enabled}",
f"-Ddd.jmxfetch.statsd.port={get_statsd_port()}",
],
)
Expand Down Expand Up @@ -493,18 +499,23 @@ def update_config(
},
)

# Set up runtime JMX configuration
with open(_get_jmx_conf_file(), "w") as file_handler:
file_handler.write(
yaml.safe_dump(
_get_runtime_jmx_config(
extra_jmx_instance_config=extra_jmx_instance_config,
if 1==1:
#if not deny_all_apm_metrics():
#logging.error("####### deny all is NOT set, enabling extra jmx") ## todo: remove this
# Set up runtime JMX configuration
with open(_get_jmx_conf_file(), "w") as file_handler:
file_handler.write(
yaml.safe_dump(
_get_runtime_jmx_config(
extra_jmx_instance_config=extra_jmx_instance_config,
)
)
)
)
jmx_config_files.append(_get_jmx_conf_file())
else:
logging.error("####### deny all is set, disabling extra jmx") ## todo: remove this else block

# Set up Datadog Java Trace Agent
jmx_config_files.append(_get_jmx_conf_file())
_set_up_dd_java_agent(
m2ee,
model_version,
Expand Down

0 comments on commit b333102

Please # to comment.