From ac884b12e1a4388e231ca7bbf8ae020f8240695d Mon Sep 17 00:00:00 2001 From: jack-berg <34418638+jack-berg@users.noreply.github.com> Date: Mon, 14 Mar 2022 18:06:52 -0500 Subject: [PATCH] Remove log name field (#4263) --- .../otlp/OtlpJsonLoggingLogExporterTest.java | 6 ------ .../otlp/http/logs/OtlpHttpLogExporterTest.java | 2 -- .../exporter/internal/otlp/logs/LogMarshaler.java | 11 ----------- .../otlp/logs/LogsRequestMarshalerTest.java | 8 -------- .../otlp/logs/OtlpGrpcLogExporterTest.java | 2 -- .../otlp/logs/OtlpGrpcNettyLogExporterTest.java | 2 -- .../logs/OtlpGrpcNettyShadedLogExporterTest.java | 2 -- .../logs/OtlpGrpcNettyOkHttpLogExporterTest.java | 2 -- .../OtlpExporterIntegrationTest.java | 3 --- .../sdk/testing/assertj/LogDataAssert.java | 15 --------------- .../sdk/testing/assertj/LogAssertionsTest.java | 6 ------ .../io/opentelemetry/sdk/logs/LogBuilder.java | 3 --- .../io/opentelemetry/sdk/logs/SdkLogBuilder.java | 7 ------- .../io/opentelemetry/sdk/logs/data/LogData.java | 9 --------- .../sdk/logs/data/LogDataBuilder.java | 13 ------------- .../opentelemetry/sdk/logs/data/LogDataImpl.java | 3 --- .../opentelemetry/sdk/logs/SdkLogBuilderTest.java | 4 ---- 17 files changed, 98 deletions(-) diff --git a/exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingLogExporterTest.java b/exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingLogExporterTest.java index 9d423c987d..19b65f4dcd 100644 --- a/exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingLogExporterTest.java +++ b/exporters/logging-otlp/src/test/java/io/opentelemetry/exporter/logging/otlp/OtlpJsonLoggingLogExporterTest.java @@ -36,10 +36,8 @@ class OtlpJsonLoggingLogExporterTest { private static final Resource RESOURCE = Resource.create(Attributes.builder().put("key", "value").build()); - @SuppressWarnings("deprecation") // test deprecated setName method private static final LogData LOG1 = LogDataBuilder.create(RESOURCE, InstrumentationScopeInfo.create("instrumentation", "1", null)) - .setName("testLog1") .setBody("body1") .setSeverity(Severity.INFO) .setSeverityText("INFO") @@ -53,11 +51,9 @@ class OtlpJsonLoggingLogExporterTest { TraceState.getDefault())) .build(); - @SuppressWarnings("deprecation") // test deprecated setName method private static final LogData LOG2 = LogDataBuilder.create( RESOURCE, InstrumentationScopeInfo.create("instrumentation2", "2", null)) - .setName("testLog2") .setBody("body2") .setSeverity(Severity.INFO) .setSeverityText("INFO") @@ -112,7 +108,6 @@ class OtlpJsonLoggingLogExporterTest { + " \"timeUnixNano\":\"1631533710000000\",\n" + " \"severityNumber\":\"SEVERITY_NUMBER_INFO\",\n" + " \"severityText\":\"INFO\",\n" - + " \"name\":\"testLog2\",\n" + " \"body\":{\n" + " \"stringValue\":\"body2\"\n" + " },\n" @@ -139,7 +134,6 @@ class OtlpJsonLoggingLogExporterTest { + " \"timeUnixNano\":\"1631533710000000\",\n" + " \"severityNumber\":\"SEVERITY_NUMBER_INFO\",\n" + " \"severityText\":\"INFO\",\n" - + " \"name\":\"testLog1\",\n" + " \"body\":{\n" + " \"stringValue\":\"body1\"\n" + " },\n" diff --git a/exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java b/exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java index 551f0d56d9..8b7534385e 100644 --- a/exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java +++ b/exporters/otlp-http/logs/src/test/java/io/opentelemetry/exporter/otlp/http/logs/OtlpHttpLogExporterTest.java @@ -330,11 +330,9 @@ class OtlpHttpLogExporterTest { return HttpResponse.of(httpStatus, APPLICATION_PROTOBUF, message.toByteArray()); } - @SuppressWarnings("deprecation") // test deprecated setName method private static LogData generateFakeLog() { return LogDataBuilder.create( Resource.getDefault(), InstrumentationScopeInfo.create("testLib", "1.0", "http://url")) - .setName("log-name") .setBody("log body") .setAttributes(Attributes.builder().put("key", "value").build()) .setSeverity(Severity.INFO) diff --git a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogMarshaler.java b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogMarshaler.java index 32c297763c..f5fa3d60b3 100644 --- a/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogMarshaler.java +++ b/exporters/otlp/common/src/main/java/io/opentelemetry/exporter/internal/otlp/logs/LogMarshaler.java @@ -28,7 +28,6 @@ final class LogMarshaler extends MarshalerWithSize { private final long timeUnixNano; private final ProtoEnumInfo severityNumber; private final byte[] severityText; - private final byte[] nameUtf8; private final MarshalerWithSize anyValueMarshaler; private final KeyValueMarshaler[] attributeMarshalers; private final int droppedAttributesCount; @@ -36,7 +35,6 @@ final class LogMarshaler extends MarshalerWithSize { @Nullable private final String traceId; @Nullable private final String spanId; - @SuppressWarnings("deprecation") // name field to be removed static LogMarshaler create(io.opentelemetry.sdk.logs.data.LogData logData) { KeyValueMarshaler[] attributeMarshalers = KeyValueMarshaler.createRepeated(logData.getAttributes()); @@ -50,7 +48,6 @@ final class LogMarshaler extends MarshalerWithSize { logData.getEpochNanos(), toProtoSeverityNumber(logData.getSeverity()), MarshalerUtil.toBytes(logData.getSeverityText()), - MarshalerUtil.toBytes(logData.getName()), anyValueMarshaler, attributeMarshalers, // TODO (trask) implement droppedAttributesCount in LogRecord @@ -64,7 +61,6 @@ final class LogMarshaler extends MarshalerWithSize { long timeUnixNano, ProtoEnumInfo severityNumber, byte[] severityText, - byte[] nameUtf8, MarshalerWithSize anyValueMarshaler, KeyValueMarshaler[] attributeMarshalers, int droppedAttributesCount, @@ -76,7 +72,6 @@ final class LogMarshaler extends MarshalerWithSize { timeUnixNano, severityNumber, severityText, - nameUtf8, anyValueMarshaler, attributeMarshalers, droppedAttributesCount, @@ -89,7 +84,6 @@ final class LogMarshaler extends MarshalerWithSize { this.traceFlags = traceFlags; this.severityNumber = severityNumber; this.severityText = severityText; - this.nameUtf8 = nameUtf8; this.anyValueMarshaler = anyValueMarshaler; this.attributeMarshalers = attributeMarshalers; this.droppedAttributesCount = droppedAttributesCount; @@ -103,8 +97,6 @@ final class LogMarshaler extends MarshalerWithSize { output.serializeString(LogRecord.SEVERITY_TEXT, severityText); - output.serializeString(LogRecord.NAME, nameUtf8); - output.serializeMessage(LogRecord.BODY, anyValueMarshaler); output.serializeRepeatedMessage(LogRecord.ATTRIBUTES, attributeMarshalers); @@ -119,7 +111,6 @@ final class LogMarshaler extends MarshalerWithSize { long timeUnixNano, ProtoEnumInfo severityNumber, byte[] severityText, - byte[] nameUtf8, MarshalerWithSize anyValueMarshaler, KeyValueMarshaler[] attributeMarshalers, int droppedAttributesCount, @@ -133,8 +124,6 @@ final class LogMarshaler extends MarshalerWithSize { size += MarshalerUtil.sizeBytes(LogRecord.SEVERITY_TEXT, severityText); - size += MarshalerUtil.sizeBytes(LogRecord.NAME, nameUtf8); - size += MarshalerUtil.sizeMessage(LogRecord.BODY, anyValueMarshaler); size += MarshalerUtil.sizeRepeatedMessage(LogRecord.ATTRIBUTES, attributeMarshalers); diff --git a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/logs/LogsRequestMarshalerTest.java b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/logs/LogsRequestMarshalerTest.java index 7519431e31..a9581d4f6e 100644 --- a/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/logs/LogsRequestMarshalerTest.java +++ b/exporters/otlp/common/src/test/java/io/opentelemetry/exporter/internal/otlp/logs/LogsRequestMarshalerTest.java @@ -46,11 +46,9 @@ class LogsRequestMarshalerTest { private static final String TRACE_ID = TraceId.fromBytes(TRACE_ID_BYTES); private static final byte[] SPAN_ID_BYTES = new byte[] {0, 0, 0, 0, 4, 3, 2, 1}; private static final String SPAN_ID = SpanId.fromBytes(SPAN_ID_BYTES); - private static final String NAME = "GET /api/endpoint"; private static final String BODY = "Hello world from this log..."; @Test - @SuppressWarnings("deprecation") // test deprecated setName method void toProtoResourceLogs() { ResourceLogsMarshaler[] resourceLogsMarshalers = ResourceLogsMarshaler.create( @@ -58,7 +56,6 @@ class LogsRequestMarshalerTest { LogDataBuilder.create( Resource.builder().put("one", 1).setSchemaUrl("http://url").build(), InstrumentationScopeInfo.create("testLib", "1.0", "http://url")) - .setName(NAME) .setBody(BODY) .setSeverity(Severity.INFO) .setSeverityText("INFO") @@ -84,7 +81,6 @@ class LogsRequestMarshalerTest { } @Test - @SuppressWarnings("deprecation") // test deprecated setName method void toProtoLogRecord() { LogRecord logRecord = parse( @@ -93,7 +89,6 @@ class LogsRequestMarshalerTest { LogDataBuilder.create( Resource.create(Attributes.builder().put("testKey", "testValue").build()), InstrumentationScopeInfo.create("instrumentation", "1", null)) - .setName(NAME) .setBody(BODY) .setSeverity(Severity.INFO) .setSeverityText("INFO") @@ -106,7 +101,6 @@ class LogsRequestMarshalerTest { assertThat(logRecord.getTraceId().toByteArray()).isEqualTo(TRACE_ID_BYTES); assertThat(logRecord.getSpanId().toByteArray()).isEqualTo(SPAN_ID_BYTES); - assertThat(logRecord.getName()).isEqualTo(NAME); assertThat(logRecord.getSeverityText()).isEqualTo("INFO"); assertThat(logRecord.getBody()).isEqualTo(AnyValue.newBuilder().setStringValue(BODY).build()); assertThat(logRecord.getAttributesList()) @@ -118,7 +112,6 @@ class LogsRequestMarshalerTest { assertThat(logRecord.getTimeUnixNano()).isEqualTo(12345); } - @SuppressWarnings("deprecation") // name field has been deprecated @Test void toProtoLogRecord_MinimalFields() { LogRecord logRecord = @@ -133,7 +126,6 @@ class LogsRequestMarshalerTest { assertThat(logRecord.getTraceId()).isEmpty(); assertThat(logRecord.getSpanId()).isEmpty(); - assertThat(logRecord.getName()).isBlank(); assertThat(logRecord.getSeverityText()).isBlank(); assertThat(logRecord.getSeverityNumber().getNumber()) .isEqualTo(Severity.UNDEFINED_SEVERITY_NUMBER.getSeverityNumber()); diff --git a/exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporterTest.java b/exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporterTest.java index 00d3d40fa8..368748ee66 100644 --- a/exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporterTest.java +++ b/exporters/otlp/logs/src/test/java/io/opentelemetry/exporter/otlp/logs/OtlpGrpcLogExporterTest.java @@ -104,7 +104,6 @@ class OtlpGrpcLogExporterTest extends AbstractGrpcTelemetryExporterTest { return this; } - /** Asserts the log has the given name. */ - @Deprecated - public LogDataAssert hasName(String name) { - isNotNull(); - if (!name.equals(actual.getName())) { - failWithActualExpectedAndMessage( - actual.getName(), - name, - "Expected log to have name <%s> but was <%s>", - name, - actual.getName()); - } - return this; - } - /** Asserts the log has the given body. */ public LogDataAssert hasBody(String body) { isNotNull(); diff --git a/sdk/logs-testing/src/test/java/io/opentelemetry/sdk/testing/assertj/LogAssertionsTest.java b/sdk/logs-testing/src/test/java/io/opentelemetry/sdk/testing/assertj/LogAssertionsTest.java index 12b3de3e4c..324ce819da 100644 --- a/sdk/logs-testing/src/test/java/io/opentelemetry/sdk/testing/assertj/LogAssertionsTest.java +++ b/sdk/logs-testing/src/test/java/io/opentelemetry/sdk/testing/assertj/LogAssertionsTest.java @@ -43,7 +43,6 @@ public class LogAssertionsTest { .put("coins", 0.01, 0.05, 0.1) .build(); - @SuppressWarnings("deprecation") // test deprecated setName method private static final LogData LOG_DATA = LogDataBuilder.create(RESOURCE, INSTRUMENTATION_SCOPE_INFO) .setEpoch(100, TimeUnit.NANOSECONDS) @@ -52,13 +51,11 @@ public class LogAssertionsTest { TRACE_ID, SPAN_ID, TraceFlags.getDefault(), TraceState.getDefault())) .setSeverity(Severity.INFO) .setSeverityText("info") - .setName("name") .setBody("message") .setAttributes(ATTRIBUTES) .build(); @Test - @SuppressWarnings("deprecation") // test deprecated hasName method void passing() { assertThat(LOG_DATA) .hasResource(RESOURCE) @@ -68,7 +65,6 @@ public class LogAssertionsTest { SpanContext.create(TRACE_ID, SPAN_ID, TraceFlags.getDefault(), TraceState.getDefault())) .hasSeverity(Severity.INFO) .hasSeverityText("info") - .hasName("name") .hasBody("message") .hasAttributes(ATTRIBUTES) .hasAttributes( @@ -115,7 +111,6 @@ public class LogAssertionsTest { } @Test - @SuppressWarnings("deprecation") // test deprecated hasName method void failure() { assertThatThrownBy(() -> assertThat(LOG_DATA).hasResource(Resource.empty())); assertThatThrownBy( @@ -132,7 +127,6 @@ public class LogAssertionsTest { TraceState.getDefault()))); assertThatThrownBy(() -> assertThat(LOG_DATA).hasSeverity(Severity.DEBUG)); assertThatThrownBy(() -> assertThat(LOG_DATA).hasSeverityText("warning")); - assertThatThrownBy(() -> assertThat(LOG_DATA).hasName("foo")); assertThatThrownBy(() -> assertThat(LOG_DATA).hasBody("bar")); assertThatThrownBy(() -> assertThat(LOG_DATA).hasAttributes(Attributes.empty())) .isInstanceOf(AssertionError.class); diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogBuilder.java index 47f8d197ba..af66889c91 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/LogBuilder.java @@ -34,9 +34,6 @@ public interface LogBuilder { /** Set the severity text. */ LogBuilder setSeverityText(String severityText); - /** Set the name. */ - LogBuilder setName(String name); - /** Set the body string. */ LogBuilder setBody(String body); diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogBuilder.java index 244c5c98de..437fba19eb 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/SdkLogBuilder.java @@ -56,13 +56,6 @@ final class SdkLogBuilder implements LogBuilder { return this; } - @Override - @Deprecated - public LogBuilder setName(String name) { - logDataBuilder.setName(name); - return this; - } - @Override public LogBuilder setBody(String body) { logDataBuilder.setBody(body); diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogData.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogData.java index 8a58371b61..2db7d95255 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogData.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogData.java @@ -50,15 +50,6 @@ public interface LogData { @Nullable String getSeverityText(); - /** - * Returns the name for this log, or null if unset. - * - * @deprecated will be removed without replacement. - */ - @Deprecated - @Nullable - String getName(); - /** Returns the body for this log, or {@link Body#empty()} if unset. */ Body getBody(); diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogDataBuilder.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogDataBuilder.java index bc96bd339a..5602849491 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogDataBuilder.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogDataBuilder.java @@ -27,7 +27,6 @@ public final class LogDataBuilder { private SpanContext spanContext = SpanContext.getInvalid(); private Severity severity = Severity.UNDEFINED_SEVERITY_NUMBER; @Nullable private String severityText; - @Nullable private String name; private Body body = Body.empty(); private final Clock clock; private Attributes attributes = Attributes.empty(); @@ -117,17 +116,6 @@ public final class LogDataBuilder { return this; } - /** - * Set the name. - * - * @deprecated will be removed without replacement. - */ - @Deprecated - public LogDataBuilder setName(String name) { - this.name = name; - return this; - } - /** Set the body string. */ public LogDataBuilder setBody(String body) { this.body = Body.string(body); @@ -152,7 +140,6 @@ public final class LogDataBuilder { spanContext, severity, severityText, - name, body, attributes); } diff --git a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogDataImpl.java b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogDataImpl.java index 244d48b465..42b690f68f 100644 --- a/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogDataImpl.java +++ b/sdk/logs/src/main/java/io/opentelemetry/sdk/logs/data/LogDataImpl.java @@ -16,7 +16,6 @@ import javax.annotation.concurrent.Immutable; @AutoValue @AutoValue.CopyAnnotations @Immutable -@SuppressWarnings("deprecation") // name field to be removed abstract class LogDataImpl implements LogData { LogDataImpl() {} @@ -28,7 +27,6 @@ abstract class LogDataImpl implements LogData { SpanContext spanContext, Severity severity, @Nullable String severityText, - @Nullable String name, Body body, Attributes attributes) { return new AutoValue_LogDataImpl( @@ -38,7 +36,6 @@ abstract class LogDataImpl implements LogData { spanContext, severity, severityText, - name, body, attributes); } diff --git a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLogBuilderTest.java b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLogBuilderTest.java index 092f54fee6..0f11830850 100644 --- a/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLogBuilderTest.java +++ b/sdk/logs/src/test/java/io/opentelemetry/sdk/logs/SdkLogBuilderTest.java @@ -25,10 +25,8 @@ import org.junit.jupiter.api.Test; class SdkLogBuilderTest { @Test - @SuppressWarnings("deprecation") // test deprecated setName method void buildAndEmit() { Instant now = Instant.now(); - String name = "skippy"; String bodyStr = "body"; String sevText = "sevText"; Severity severity = Severity.DEBUG3; @@ -56,8 +54,6 @@ class SdkLogBuilderTest { verify(delegate).setAttributes(attrs); builder.setContext(context); verify(delegate).setContext(context); - builder.setName(name); - verify(delegate).setName(name); builder.setSeverity(severity); verify(delegate).setSeverity(severity); builder.setSeverityText(sevText);