Skip to content

Commit 5935705

Browse files
committed
enabling opentelemetry metrics default as true
enabling opentelemetry metrics default as true
1 parent 50cd86a commit 5935705

3 files changed

Lines changed: 28 additions & 8 deletions

File tree

src/Agent/NewRelic/Agent/Core/Config/Configuration.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6877,11 +6877,11 @@ public partial class configurationOpenTelemetryMetrics
68776877
/// </summary>
68786878
public configurationOpenTelemetryMetrics()
68796879
{
6880-
this.enabledField = false;
6880+
this.enabledField = true;
68816881
}
68826882

68836883
[System.Xml.Serialization.XmlAttributeAttribute()]
6884-
[System.ComponentModel.DefaultValueAttribute(false)]
6884+
[System.ComponentModel.DefaultValueAttribute(true)]
68856885
public bool enabled
68866886
{
68876887
get

src/Agent/NewRelic/Agent/Core/Config/Configuration.xsd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2302,10 +2302,11 @@
23022302
</xs:annotation>
23032303

23042304
<xs:complexType>
2305-
<xs:attribute name="enabled" type="xs:boolean" default="false">
2305+
<xs:attribute name="enabled" type="xs:boolean" default="true">
23062306
<xs:annotation>
23072307
<xs:documentation>
2308-
Set this to "true" to enable OpenTelemetry metrics collection and export to New Relic.
2308+
This setting controls whether OpenTelemetry metrics collection and export to New Relic is enabled.
2309+
Defaults to "true".
23092310
This feature must be used together with the global openTelemetry enabled setting.
23102311
Environment variable: NEW_RELIC_OPENTELEMETRY_METRICS_ENABLED
23112312
</xs:documentation>

tests/Agent/UnitTests/Core.UnitTest/Configuration/OpenTelemetryConfigurationTests.cs

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ public void SetUp()
4747
[Test]
4848
public void OpenTelemetryEnabled_DefaultValue_ShouldBeFalse()
4949
{
50-
// Act & Assert
50+
// Act & Assert - global opentelemetry.enabled defaults to false, but metrics.enabled defaults to true
5151
NrAssert.Multiple(
5252
() => Assert.That(_configuration.OpenTelemetryEnabled, Is.False),
53-
() => Assert.That(_configuration.OpenTelemetryMetricsEnabled, Is.False)
53+
() => Assert.That(_configuration.OpenTelemetryMetricsEnabled, Is.False) // Still false because global is false
5454
);
5555
}
5656

@@ -78,15 +78,15 @@ public void OpenTelemetryMetricsEnabled_RequiresBothGlobalAndMetricsSettings_ToB
7878
}
7979

8080
[Test]
81-
public void OpenTelemetryMetricsEnabled_WithOnlyGlobalSettingTrue_ShouldBeFalse()
81+
public void OpenTelemetryMetricsEnabled_WithOnlyGlobalSettingTrue_AndMetricsExplicitlyDisabled_ShouldBeFalse()
8282
{
8383
// Arrange
8484
_localConfig.openTelemetry = new configurationOpenTelemetry
8585
{
8686
enabled = true,
8787
metrics = new configurationOpenTelemetryMetrics
8888
{
89-
enabled = false // metrics specific setting is false
89+
enabled = false // metrics specific setting is explicitly disabled
9090
}
9191
};
9292

@@ -99,6 +99,25 @@ public void OpenTelemetryMetricsEnabled_WithOnlyGlobalSettingTrue_ShouldBeFalse(
9999
);
100100
}
101101

102+
[Test]
103+
public void OpenTelemetryMetricsEnabled_WithOnlyGlobalSettingTrue_DefaultMetrics_ShouldBeTrue()
104+
{
105+
// Arrange - metrics.enabled now defaults to true
106+
_localConfig.openTelemetry = new configurationOpenTelemetry
107+
{
108+
enabled = true
109+
// metrics element not specified, should use default (true)
110+
};
111+
112+
var configuration = new TestableDefaultConfiguration(_environment, _localConfig, _serverConfig, _runTimeConfig, _securityPoliciesConfiguration, _bootstrapConfiguration, _processStatic, _httpRuntimeStatic, _configurationManagerStatic, _dnsStatic);
113+
114+
// Act & Assert
115+
NrAssert.Multiple(
116+
() => Assert.That(configuration.OpenTelemetryEnabled, Is.True),
117+
() => Assert.That(configuration.OpenTelemetryMetricsEnabled, Is.True)
118+
);
119+
}
120+
102121
[Test]
103122
public void OpenTelemetryMetricsIncludeFilters_ShouldParseCommaSeparatedValues()
104123
{

0 commit comments

Comments
 (0)