Skip to content

Commit d7e04f6

Browse files
committed
fix(o11y): remove gpc.client.language attribute
1 parent 4b5e8af commit d7e04f6

File tree

3 files changed

+6
-32
lines changed

3 files changed

+6
-32
lines changed

sdk-platform-java/gax-java/gax/src/main/java/com/google/api/gax/tracing/SpanTracer.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@
4545
@BetaApi
4646
@InternalApi
4747
public class SpanTracer implements ApiTracer {
48-
public static final String LANGUAGE_ATTRIBUTE = "gcp.client.language";
49-
50-
public static final String DEFAULT_LANGUAGE = "Java";
5148

5249
static final String CONTENT_LENGTH_KEY = "Content-Length";
5350

@@ -103,7 +100,6 @@ private static String resolveAttemptSpanName(ApiTracerContext apiTracerContext)
103100
}
104101

105102
private void buildAttributes() {
106-
this.attemptAttributes.put(LANGUAGE_ATTRIBUTE, DEFAULT_LANGUAGE);
107103
this.attemptAttributes.putAll(this.apiTracerContext.getAttemptAttributes());
108104
}
109105

sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/tracing/SpanTracerTest.java

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -84,19 +84,6 @@ void testAttemptLifecycle_startsAndEndsAttemptSpan() {
8484
verify(span).end();
8585
}
8686

87-
@Test
88-
void testAttemptStarted_includesLanguageAttribute() {
89-
spanTracer.attemptStarted(new Object(), 1);
90-
91-
ArgumentCaptor<Attributes> attributesCaptor = ArgumentCaptor.forClass(Attributes.class);
92-
verify(spanBuilder).setAllAttributes(attributesCaptor.capture());
93-
94-
assertThat(attributesCaptor.getValue().asMap())
95-
.containsEntry(
96-
io.opentelemetry.api.common.AttributeKey.stringKey(SpanTracer.LANGUAGE_ATTRIBUTE),
97-
SpanTracer.DEFAULT_LANGUAGE);
98-
}
99-
10087
@Test
10188
void testAttemptSucceeded_grpc() {
10289
ApiTracerContext context =

sdk-platform-java/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/ITOtelTracing.java

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import com.google.api.gax.rpc.TransportChannelProvider;
4343
import com.google.api.gax.rpc.UnavailableException;
4444
import com.google.api.gax.tracing.ObservabilityAttributes;
45-
import com.google.api.gax.tracing.SpanTracer;
4645
import com.google.api.gax.tracing.SpanTracerFactory;
4746
import com.google.common.collect.ImmutableList;
4847
import com.google.protobuf.InvalidProtocolBufferException;
@@ -134,11 +133,6 @@ void testTracing_successfulEcho_grpc() throws Exception {
134133
.findFirst()
135134
.orElseThrow(() -> new AssertionError("Incorrect span name"));
136135
assertThat(attemptSpan.getKind()).isEqualTo(SpanKind.CLIENT);
137-
assertThat(
138-
attemptSpan
139-
.getAttributes()
140-
.get(AttributeKey.stringKey(SpanTracer.LANGUAGE_ATTRIBUTE)))
141-
.isEqualTo(SpanTracer.DEFAULT_LANGUAGE);
142136
assertThat(
143137
attemptSpan
144138
.getAttributes()
@@ -205,11 +199,6 @@ void testTracing_successfulEcho_httpjson() throws Exception {
205199
.orElseThrow(
206200
() -> new AssertionError("Attempt span 'POST v1beta1/echo:echo' not found"));
207201
assertThat(attemptSpan.getKind()).isEqualTo(SpanKind.CLIENT);
208-
assertThat(
209-
attemptSpan
210-
.getAttributes()
211-
.get(AttributeKey.stringKey(SpanTracer.LANGUAGE_ATTRIBUTE)))
212-
.isEqualTo(SpanTracer.DEFAULT_LANGUAGE);
213202
assertThat(
214203
attemptSpan
215204
.getAttributes()
@@ -491,8 +480,9 @@ public void sendMessage(ReqT message) {}
491480

492481
assertThrows(UnavailableException.class, () -> client.echo(echoRequest));
493482
verifyErrorTypeAttribute("UNAVAILABLE");
494-
}
495-
}
483+
}
484+
}
485+
496486
@Test
497487
void testTracing_statusCodes_grpc() throws Exception {
498488
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
@@ -626,8 +616,9 @@ public String getHeaderValue(int index) {
626616

627617
assertThrows(UnavailableException.class, () -> client.echo(echoRequest));
628618
verifyErrorTypeAttribute("503");
629-
}
630-
}
619+
}
620+
}
621+
631622
void testTracing_statusCodes_httpjson() throws Exception {
632623
SpanTracerFactory tracingFactory = new SpanTracerFactory(openTelemetrySdk);
633624
EchoRequest errorRequest =

0 commit comments

Comments
 (0)