Skip to content

Commit e2b5245

Browse files
author
Anuraag Agrawal
authored
Rename newBuilder to builder for consistency. (open-telemetry#1790)
1 parent 939d1b8 commit e2b5245

75 files changed

Lines changed: 196 additions & 205 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎QUICKSTART.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ TracerSdkManagement tracerSdkManagement = OpenTelemetrySdk.getTracerManagement()
316316

317317
// Set to export the traces to a logging stream
318318
tracerSdkManagement.addSpanProcessor(
319-
SimpleSpanProcessor.newBuilder(
319+
SimpleSpanProcessor.builder(
320320
new LoggingSpanExporter()
321321
).build());
322322
```
@@ -360,14 +360,14 @@ in bulk. Multiple Span processors can be configured to be active at the same tim
360360

361361
```java
362362
tracerSdkManagement.addSpanProcessor(
363-
SimpleSpanProcessor.newBuilder(new LoggingSpanExporter()).build()
363+
SimpleSpanProcessor.builder(new LoggingSpanExporter()).build()
364364
);
365365
tracerSdkManagement.addSpanProcessor(
366-
BatchSpanProcessor.newBuilder(new LoggingSpanExporter()).build()
366+
BatchSpanProcessor.builder(new LoggingSpanExporter()).build()
367367
);
368368
tracerSdkManagement.addSpanProcessor(MultiSpanProcessor.create(Arrays.asList(
369-
SimpleSpanProcessor.newBuilder(new LoggingSpanExporter()).build(),
370-
BatchSpanProcessor.newBuilder(new LoggingSpanExporter()).build()
369+
SimpleSpanProcessor.builder(new LoggingSpanExporter()).build(),
370+
BatchSpanProcessor.builder(new LoggingSpanExporter()).build()
371371
)));
372372
```
373373

@@ -385,16 +385,16 @@ Other exporters can be found in the [OpenTelemetry Registry].
385385

386386
```java
387387
tracerSdkManagement.addSpanProcessor(
388-
SimpleSpanProcessor.newBuilder(InMemorySpanExporter.create()).build());
388+
SimpleSpanProcessor.builder(InMemorySpanExporter.create()).build());
389389
tracerSdkManagement.addSpanProcessor(
390-
SimpleSpanProcessor.newBuilder(new LoggingSpanExporter()).build());
390+
SimpleSpanProcessor.builder(new LoggingSpanExporter()).build());
391391

392392
ManagedChannel jaegerChannel =
393393
ManagedChannelBuilder.forAddress([ip:String], [port:int]).usePlaintext().build();
394-
JaegerGrpcSpanExporter jaegerExporter = JaegerGrpcSpanExporter.newBuilder()
394+
JaegerGrpcSpanExporter jaegerExporter = JaegerGrpcSpanExporter.builder()
395395
.setServiceName("example").setChannel(jaegerChannel).setDeadline(30000)
396396
.build();
397-
tracerSdkManagement.addSpanProcessor(BatchSpanProcessor.newBuilder(
397+
tracerSdkManagement.addSpanProcessor(BatchSpanProcessor.builder(
398398
jaegerExporter
399399
).build());
400400
```

‎api/src/main/java/io/opentelemetry/common/Attributes.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
@Immutable
3535
public abstract class Attributes extends ImmutableKeyValuePairs<AttributeKey, Object>
3636
implements ReadableAttributes {
37-
private static final Attributes EMPTY = Attributes.newBuilder().build();
37+
private static final Attributes EMPTY = Attributes.builder().build();
3838

3939
@AutoValue
4040
@Immutable
@@ -179,12 +179,12 @@ private static Attributes sortAndFilterToAttributes(Object... data) {
179179
}
180180

181181
/** Returns a new {@link Builder} instance for creating arbitrary {@link Attributes}. */
182-
public static Builder newBuilder() {
182+
public static Builder builder() {
183183
return new Builder();
184184
}
185185

186186
/** Returns a new {@link Builder} instance from ReadableAttributes. */
187-
public static Builder newBuilder(ReadableAttributes attributes) {
187+
public static Builder builder(ReadableAttributes attributes) {
188188
final Builder builder = new Builder();
189189
attributes.forEach(builder::setAttribute);
190190
return builder;

‎api/src/main/java/io/opentelemetry/common/Labels.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@Immutable
1515
public abstract class Labels extends ImmutableKeyValuePairs<String, String> {
1616

17-
private static final Labels EMPTY = Labels.newBuilder().build();
17+
private static final Labels EMPTY = Labels.builder().build();
1818

1919
public abstract void forEach(LabelConsumer consumer);
2020

@@ -117,7 +117,7 @@ public Builder toBuilder() {
117117
}
118118

119119
/** Creates a new {@link Builder} instance for creating arbitrary {@link Labels}. */
120-
public static Builder newBuilder() {
120+
public static Builder builder() {
121121
return new Builder();
122122
}
123123

‎api/src/test/java/io/opentelemetry/common/AttributesTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void forEach_singleAttribute() {
5050

5151
@Test
5252
void builder_nullKey() {
53-
Attributes attributes = Attributes.newBuilder().setAttribute(stringKey(null), "value").build();
53+
Attributes attributes = Attributes.builder().setAttribute(stringKey(null), "value").build();
5454
assertThat(attributes).isEqualTo(Attributes.empty());
5555
}
5656

@@ -125,7 +125,7 @@ void emptyAndNullKey() {
125125
@Test
126126
void builder() {
127127
Attributes attributes =
128-
Attributes.newBuilder()
128+
Attributes.builder()
129129
.setAttribute("string", "value1")
130130
.setAttribute("long", 100)
131131
.setAttribute(longKey("long2"), 10)
@@ -148,7 +148,7 @@ void builder() {
148148
false);
149149
assertThat(attributes).isEqualTo(wantAttributes);
150150

151-
Attributes.Builder newAttributes = Attributes.newBuilder(attributes);
151+
Attributes.Builder newAttributes = Attributes.builder(attributes);
152152
newAttributes.setAttribute("newKey", "newValue");
153153
assertThat(newAttributes.build())
154154
.isEqualTo(
@@ -172,7 +172,7 @@ void builder() {
172172
@Test
173173
void builder_arrayTypes() {
174174
Attributes attributes =
175-
Attributes.newBuilder()
175+
Attributes.builder()
176176
.setAttribute("string", "value1", "value2")
177177
.setAttribute("long", 100L, 200L)
178178
.setAttribute("double", 33.44, -44.33)
@@ -230,7 +230,7 @@ void get() {
230230
@Test
231231
void toBuilder() {
232232
Attributes filled =
233-
Attributes.newBuilder().setAttribute("cat", "meow").setAttribute("dog", "bark").build();
233+
Attributes.builder().setAttribute("cat", "meow").setAttribute("dog", "bark").build();
234234

235235
Attributes fromEmpty =
236236
Attributes.empty()
@@ -242,16 +242,16 @@ void toBuilder() {
242242
// Original not mutated.
243243
assertThat(Attributes.empty().isEmpty()).isTrue();
244244

245-
Attributes partial = Attributes.newBuilder().setAttribute("cat", "meow").build();
245+
Attributes partial = Attributes.builder().setAttribute("cat", "meow").build();
246246
Attributes fromPartial = partial.toBuilder().setAttribute("dog", "bark").build();
247247
assertThat(fromPartial).isEqualTo(filled);
248248
// Original not mutated.
249-
assertThat(partial).isEqualTo(Attributes.newBuilder().setAttribute("cat", "meow").build());
249+
assertThat(partial).isEqualTo(Attributes.builder().setAttribute("cat", "meow").build());
250250
}
251251

252252
@Test
253253
void nullsAreNoOps() {
254-
Attributes.Builder builder = Attributes.newBuilder();
254+
Attributes.Builder builder = Attributes.builder();
255255
builder.setAttribute(stringKey("attrValue"), "attrValue");
256256
builder.setAttribute("string", "string");
257257
builder.setAttribute("long", 10);

‎api/src/test/java/io/opentelemetry/common/LabelsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ void fourLabels() {
9898
@Test
9999
void builder() {
100100
Labels labels =
101-
Labels.newBuilder()
101+
Labels.builder()
102102
.setLabel("key1", "duplicateShouldBeIgnored")
103103
.setLabel("key1", "value1")
104104
.setLabel("key2", "value2")

‎exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
*
2626
* {@literal @}Before
2727
* public void setup() {
28-
* tracer.addSpanProcessor(SimpleSampledSpansProcessor.newBuilder(testExporter).build());
28+
* tracer.addSpanProcessor(SimpleSampledSpansProcessor.builder(testExporter).build());
2929
* }
3030
*
3131
* {@literal @}Test

‎exporters/inmemory/src/main/java/io/opentelemetry/exporters/inmemory/InMemoryTracing.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public final InMemoryTracing build() {
9393
.addTextMapPropagator(HttpTraceContext.getInstance())
9494
.build());
9595
InMemorySpanExporter exporter = InMemorySpanExporter.create();
96-
getTracerSdkManagement().addSpanProcessor(SimpleSpanProcessor.newBuilder(exporter).build());
96+
getTracerSdkManagement().addSpanProcessor(SimpleSpanProcessor.builder(exporter).build());
9797
return setSpanExporter(exporter).autoBuild();
9898
}
9999
}

‎exporters/inmemory/src/test/java/io/opentelemetry/exporters/inmemory/InMemorySpanExporterTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class InMemorySpanExporterTest {
2929

3030
@BeforeEach
3131
void setup() {
32-
tracerSdkProvider.addSpanProcessor(SimpleSpanProcessor.newBuilder(exporter).build());
32+
tracerSdkProvider.addSpanProcessor(SimpleSpanProcessor.builder(exporter).build());
3333
}
3434

3535
@Test
@@ -87,7 +87,7 @@ void export_ReturnCode() {
8787
}
8888

8989
static SpanData makeBasicSpan() {
90-
return TestSpanData.newBuilder()
90+
return TestSpanData.builder()
9191
.setHasEnded(true)
9292
.setTraceId(TraceId.getInvalid())
9393
.setSpanId(SpanId.getInvalid())

‎exporters/jaeger/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spans will be sent to a Jaeger gRPC endpoint running on `localhost`:
1313

1414
```java
1515
JaegerGrpcSpanExporter exporter =
16-
JaegerGrpcSpanExporter.newBuilder()
16+
JaegerGrpcSpanExporter.builder()
1717
.setEndpoint("localhost:14250")
1818
.setServiceName("my-service")
1919
.build();
@@ -24,15 +24,15 @@ Service name and Endpoint can be also configured via environment variables or sy
2424
```java
2525
// Using environment variables
2626
JaegerGrpcSpanExporter exporter =
27-
JaegerGrpcSpanExporter.newBuilder()
27+
JaegerGrpcSpanExporter.builder()
2828
.readEnvironmentVariables()
2929
.build()
3030
```
3131

3232
```java
3333
// Using system properties
3434
JaegerGrpcSpanExporter exporter =
35-
JaegerGrpcSpanExporter.newBuilder()
35+
JaegerGrpcSpanExporter.builder()
3636
.readSystemProperties()
3737
.build()
3838
```

‎exporters/jaeger/src/main/java/io/opentelemetry/exporters/jaeger/JaegerGrpcSpanExporter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public CompletableResultCode flush() {
152152
*
153153
* @return a new builder instance for this exporter.
154154
*/
155-
public static Builder newBuilder() {
155+
public static Builder builder() {
156156
return new Builder();
157157
}
158158

0 commit comments

Comments
 (0)