Skip to content

Commit d8fdfa6

Browse files
committed
Move log total attribute count fix to separate PR
1 parent 8da03f0 commit d8fdfa6

2 files changed

Lines changed: 5 additions & 13 deletions

File tree

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/internal/TelemetryConverter.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -313,9 +313,7 @@ private static LogRecordData createLogData(
313313
TraceState.getDefault())) // logs proto doesn't have trace state
314314
.setSeverity(fromProto(logRecord.getSeverityNumber()))
315315
.setSeverityText(logRecord.getSeverityText())
316-
.setAttributes(fromProto(logRecord.getAttributesList()))
317-
.setTotalAttributeCount(
318-
logRecord.getAttributesCount() + logRecord.getDroppedAttributesCount());
316+
.setAttributes(fromProto(logRecord.getAttributesList()));
319317
if (canUseValue) {
320318
builder.setBodyValue(getBodyValue(logRecord.getBody()));
321319
} else {
@@ -342,9 +340,7 @@ private static LogRecordData createExtendedLogData(
342340
.setSeverity(fromProto(logRecord.getSeverityNumber()))
343341
.setSeverityText(logRecord.getSeverityText())
344342
.setEventName(logRecord.getEventName())
345-
.setBodyValue(getBodyValue(logRecord.getBody()))
346-
.setTotalAttributeCount(
347-
logRecord.getAttributesCount() + logRecord.getDroppedAttributesCount());
343+
.setBodyValue(getBodyValue(logRecord.getBody()));
348344
if (hasExtendedAttributes) {
349345
builder.setExtendedAttributes(fromProtoExtended(logRecord.getAttributesList()));
350346
} else {

testing/agent-for-testing/src/test/java/io/opentelemetry/javaagent/testing/AgentForTestingTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
package io.opentelemetry.javaagent.testing;
77

8-
import static io.opentelemetry.api.common.AttributeKey.stringKey;
98
import static org.assertj.core.api.Assertions.assertThat;
109

1110
import io.opentelemetry.api.GlobalOpenTelemetry;
@@ -52,13 +51,10 @@ void exportAndRetrieveMetrics() {
5251
@Test
5352
void exportAndRetrieveLogRecords() {
5453
Logger logger = GlobalOpenTelemetry.get().getLogsBridge().loggerBuilder("test").build();
55-
logger.logRecordBuilder().setBody("testBody").setAttribute("testKey", "testValue").emit();
54+
logger.logRecordBuilder().setBody("testBody").emit();
5655

5756
List<LogRecordData> logRecords = AgentTestingExporterAccess.getExportedLogRecords();
58-
assertThat(logRecords).hasSize(1);
59-
LogRecordData logRecord = logRecords.get(0);
60-
assertThat(logRecord.getBodyValue().getValue()).isEqualTo("testBody");
61-
assertThat(logRecord.getAttributes().get(stringKey("testKey"))).isEqualTo("testValue");
62-
assertThat(logRecord.getTotalAttributeCount()).isEqualTo(1);
57+
assertThat(logRecords.size()).isEqualTo(1);
58+
assertThat(logRecords.get(0).getBodyValue().getValue()).isEqualTo("testBody");
6359
}
6460
}

0 commit comments

Comments
 (0)