Skip to content

Commit 99129ae

Browse files
xiang17github-actions[bot]
authored andcommitted
Fix compile errors
1 parent 6a50293 commit 99129ae

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/SecondEntryPoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,8 @@ private static MetricExporter buildMetricExporter(
370370

371371
String otelMetricsEndpoint = configProperties.getString("otel.metrics.exporter.otlp.endpoint");
372372
String otelMetricsExporter = configProperties.getString("otel.metrics.exporter");
373-
boolean otlpEnabled = (otelMetricsExporter != null && !otelMetricsExporter.isEmpty()) &&
374-
(otelMetricsEndpoint != null && !otelMetricsEndpoint.isEmpty());
373+
Boolean otlpEnabled = (otelMetricsExporter != null && !otelMetricsExporter.isEmpty()) &&
374+
(otelMetricsEndpoint != null && !otelMetricsEndpoint.isEmpty());
375375

376376
MetricDataMapper mapper =
377377
new MetricDataMapper(

agent/agent-tooling/src/test/java/com/microsoft/applicationinsights/agent/internal/PreAggregatedMetricsTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ void generateHttpClientMetrics() {
136136
MetricTelemetryBuilder builder = MetricTelemetryBuilder.create();
137137
MetricData metricData = metricDataCollection.iterator().next();
138138
MetricDataMapper.updateMetricPointBuilder(
139-
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true);
139+
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true, null);
140140
TelemetryItem telemetryItem = builder.build();
141141
MetricsData metricsData = (MetricsData) telemetryItem.getData().getBaseData();
142142

@@ -211,7 +211,7 @@ void generateRpcClientMetrics() {
211211
MetricTelemetryBuilder builder = MetricTelemetryBuilder.create();
212212
MetricData metricData = metricDataCollection.iterator().next();
213213
MetricDataMapper.updateMetricPointBuilder(
214-
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true);
214+
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true, null);
215215
TelemetryItem telemetryItem = builder.build();
216216
MetricsData metricsData = (MetricsData) telemetryItem.getData().getBaseData();
217217

@@ -291,7 +291,7 @@ void generateHttpServerMetrics() {
291291
MetricTelemetryBuilder builder = MetricTelemetryBuilder.create();
292292
MetricData metricData = target;
293293
MetricDataMapper.updateMetricPointBuilder(
294-
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true);
294+
builder, metricData, metricData.getData().getPoints().iterator().next(), true, true, null);
295295
TelemetryItem telemetryItem = builder.build();
296296
MetricsData metricsData = (MetricsData) telemetryItem.getData().getBaseData();
297297

smoke-tests/apps/OpenTelemetryMetric/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ dependencies {
77
exclude("org.springframework.boot", "spring-boot-starter-tomcat")
88
}
99
implementation("io.opentelemetry:opentelemetry-api:1.12.0")
10-
10+
1111
smokeTestImplementation("org.mock-server:mockserver-netty:5.15.0:shaded")
1212
smokeTestImplementation("org.awaitility:awaitility:4.2.0")
1313
smokeTestImplementation("io.opentelemetry.proto:opentelemetry-proto:0.14.0-alpha")

smoke-tests/apps/OpenTelemetryMetric/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/OpenTelemetryMetricTestToAmw.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,16 @@
2929
import java.util.Comparator;
3030
import java.util.List;
3131
import java.util.Map;
32-
import java.util.stream.Collectors;
3332
import org.junit.jupiter.api.Test;
3433
import org.junit.jupiter.api.extension.RegisterExtension;
3534
import org.mockserver.model.HttpRequest;
3635

3736
@UseAgent
3837
abstract class OpenTelemetryMetricTestToAmw {
3938

40-
@RegisterExtension
41-
static final SmokeTestExtension testing = SmokeTestExtension.builder()
42-
.useOtlpViaEnvVars()
43-
.build();
39+
@RegisterExtension
40+
static final SmokeTestExtension testing =
41+
SmokeTestExtension.builder().useOtlpViaEnvVars().build();
4442

4543
@Test
4644
@TargetUri("/trackDoubleCounterMetric")
@@ -144,17 +142,19 @@ private void validateCounterMetric(String name) throws Exception {
144142
assertThat(properties3).containsEntry("name", "lemon");
145143
assertThat(properties3).containsEntry("color", "yellow");
146144
assertThat(properties3).containsEntry("_MS.SentToAMW", "true");
147-
148145
}
149146

150147
private void validateOtlpMetricsReceived(String name) throws Exception {
151148
await()
152149
.atMost(10, SECONDS)
153150
.untilAsserted(
154151
() -> {
155-
HttpRequest[] otlpRequests = testing.mockedOtlpIngestion.getCollectorServer()
156-
.retrieveRecordedRequests(request());
157-
152+
HttpRequest[] otlpRequests =
153+
testing
154+
.mockedOtlpIngestion
155+
.getCollectorServer()
156+
.retrieveRecordedRequests(request());
157+
158158
assertThat(otlpRequests).isNotEmpty();
159159

160160
List<Metric> otlpMetrics =

0 commit comments

Comments
 (0)