Skip to content

Commit 322f5ad

Browse files
committed
fix native build and update telemetry test with clear error message
1 parent 2e776be commit 322f5ad

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

dd-java-agent/instrumentation/graal/native-image/src/main/java/datadog/trace/instrumentation/graal/nativeimage/NativeImageGeneratorRunnerInstrumentation.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,9 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
102102
+ "datadog.trace.api.ResolverCacheConfig$5:build_time,"
103103
+ "datadog.trace.api.TracePropagationStyle:build_time,"
104104
+ "datadog.trace.api.TracePropagationBehaviorExtract:build_time,"
105-
+ "datadog.trace.api.telemetry.OtelEnvMetricCollectorImpl:build_time,"
105+
+ "datadog.trace.api.telemetry.ConfigInversionMetricCollectorProvider:rerun,"
106106
+ "datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl:build_time,"
107+
+ "datadog.trace.api.telemetry.OtelEnvMetricCollectorImpl:build_time,"
107108
+ "datadog.trace.api.profiling.ProfilingEnablement:build_time,"
108109
+ "datadog.trace.bootstrap.config.provider.ConfigConverter:build_time,"
109110
+ "datadog.trace.bootstrap.config.provider.ConfigConverter$ValueOfLookup:build_time,"
@@ -141,7 +142,7 @@ public static void onEnter(@Advice.Argument(value = 0, readOnly = false) String[
141142
+ "datadog.trace.bootstrap.instrumentation.jfr.directallocation.DirectAllocationTotalEvent:build_time,"
142143
+ "datadog.trace.bootstrap.WeakMapContextStore:build_time,"
143144
+ "datadog.trace.config.inversion.ConfigHelper:rerun,"
144-
+ "datadog.trace.config.inversion.ConfigInversionMetricCollectorProvider:rerun,"
145+
+ "datadog.trace.config.inversion.ConfigHelper$StrictnessPolicy:rerun,"
145146
+ "datadog.trace.config.inversion.GeneratedSupportedConfigurations:rerun,"
146147
+ "datadog.trace.instrumentation.guava10.GuavaAsyncResultExtension:build_time,"
147148
+ "datadog.trace.instrumentation.reactivestreams.ReactiveStreamsAsyncResultExtension:build_time,"

internal-api/src/test/groovy/datadog/trace/api/telemetry/ConfigInversionMetricCollectorImplTest.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ class ConfigInversionMetricCollectorImplTest extends DDSpecification {
1111
def collector = ConfigInversionMetricCollectorImpl.getInstance()
1212

1313
when:
14-
ConfigInversionMetricCollectorTestHelper.checkAndEmitUnsupported("DD_UNKNOWN_FEATURE")
14+
ConfigInversionMetricCollectorTestHelper.checkAndEmitUnsupported("FAKE_ENV_VAR")
1515
collector.prepareMetrics()
1616
def metrics = collector.drain()
1717

1818
then:
19-
metrics.size() == 1
19+
assert metrics.size() == 1 : "The following Environment Variables need to be added to metadata/supported-configurations.json: ${metrics}"
2020
def metric = metrics[0]
2121
metric.type == 'count'
2222
metric.value == 1
2323
metric.namespace == 'tracers'
2424
metric.metricName == CONFIG_INVERSION_METRIC_NAME
2525
metric.tags.size() == 1
26-
metric.tags[0] == 'config_name:DD_UNKNOWN_FEATURE'
26+
metric.tags[0] == 'config_name:FAKE_ENV_VAR'
2727
}
2828

2929
def "should not emit metric when supported env var is used"() {
@@ -36,6 +36,6 @@ class ConfigInversionMetricCollectorImplTest extends DDSpecification {
3636
def metrics = collector.drain()
3737

3838
then:
39-
metrics.isEmpty()
39+
assert metrics.isEmpty() : "The following Environment Variables need to be added to metadata/supported-configurations.json: ${metrics}"
4040
}
4141
}

0 commit comments

Comments
 (0)