Skip to content

Events #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2022
Merged

Events #52

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a3229b
WIP
marcingrzejszczak Aug 22, 2022
8d09cd0
Updated code to use new Events
marcingrzejszczak Aug 23, 2022
550a31e
Moved Event back to Observation
marcingrzejszczak Aug 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .../java/io/micrometer/tracing/brave/handler/DefaultTracingObservationHandlerBraveTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,10 @@

package io.micrometer.tracing.brave.handler;

import java.io.IOException;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import brave.Tracing;
import brave.handler.MutableSpan;
import brave.test.TestSpanHandler;
import io.micrometer.common.Event;
import io.micrometer.observation.Observation;
import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.tracing.Tracer;
Expand All @@ -37,6 +33,11 @@
import io.micrometer.tracing.test.simple.SpansAssert;
import org.junit.jupiter.api.Test;

import java.io.IOException;
Copy link
Member

@jonatan-ivanov jonatan-ivanov Aug 24, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your formatter started doing weird things again. :)

import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

import static org.assertj.core.api.BDDAssertions.then;

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -142,7 +143,7 @@ void should_signal_errors() {

@Test
void should_signal_events() {
Observation.Event event = new Observation.Event("foo", "bar");
Event event = Event.of("foo", "bar");
Observation.Context context = new Observation.Context();
context.setName("foo");

Expand Down
21 changes: 9 additions & 12 deletions ...st/java/io/micrometer/tracing/otel/handler/DefaultTracingObservationHandlerOtelTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,13 @@

package io.micrometer.tracing.otel.handler;

import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Queue;
import java.util.stream.Collectors;

import io.micrometer.common.Event;
import io.micrometer.observation.Observation;
import io.micrometer.observation.tck.TestObservationRegistry;
import io.micrometer.tracing.Tracer;
import io.micrometer.tracing.exporter.FinishedSpan;
import io.micrometer.tracing.handler.DefaultTracingObservationHandler;
import io.micrometer.tracing.otel.bridge.ArrayListSpanProcessor;
import io.micrometer.tracing.otel.bridge.OtelBaggageManager;
import io.micrometer.tracing.otel.bridge.OtelCurrentTraceContext;
import io.micrometer.tracing.otel.bridge.OtelFinishedSpan;
import io.micrometer.tracing.otel.bridge.OtelTracer;
import io.micrometer.tracing.otel.bridge.*;
import io.micrometer.tracing.test.simple.SpanAssert;
import io.micrometer.tracing.test.simple.SpansAssert;
import io.opentelemetry.api.common.AttributeKey;
Expand All @@ -44,6 +35,12 @@
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import org.junit.jupiter.api.Test;

import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.Queue;
import java.util.stream.Collectors;

import static org.assertj.core.api.BDDAssertions.then;

@SuppressWarnings("unchecked")
Expand Down Expand Up @@ -160,7 +157,7 @@ void should_signal_errors() {

@Test
void should_signal_events() {
Observation.Event event = new Observation.Event("foo", "bar");
Event event = Event.of("foo", "bar");
Observation.Context context = new Observation.Context();
context.setName("foo");

Expand Down
1 change: 1 addition & 0 deletions micrometer-tracing-tests/micrometer-tracing-integration-test/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ dependencies {
api project(':micrometer-tracing')
api project(':micrometer-tracing-test')
api project(':micrometer-tracing-reporter-wavefront')
api 'io.micrometer:micrometer-core'
api 'io.micrometer:micrometer-test'

// Brave
Expand Down
7 changes: 4 additions & 3 deletions micrometer-tracing/src/main/java/io/micrometer/tracing/docs/DocumentedSpan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package io.micrometer.tracing.docs;

import io.micrometer.common.Event;
import io.micrometer.common.docs.KeyName;

/**
Expand All @@ -32,7 +33,7 @@
* interface</li>
* <li>If the span contains {@link KeyName} then those need to be declared as nested
* enums</li>
* <li>If the span contains {@link EventValue} then those need to be declared as nested
* <li>If the span contains {@link Event} then those need to be declared as nested
* enums</li>
* <li>The {@link DocumentedSpan#getKeyNames()} need to call the nested enum's
* {@code values()} method to retrieve the array of allowed keys</li>
Expand All @@ -54,7 +55,7 @@ public interface DocumentedSpan {
/**
* Empty values.
*/
EventValue[] EMPTY_VALUES = new EventValue[0];
Event[] EMPTY_VALUES = new Event[0];

/**
* Span name.
Expand All @@ -79,7 +80,7 @@ default String getName(String... vars) {
* Allowed events.
* @return allowed events
*/
default EventValue[] getEvents() {
default Event[] getEvents() {
return EMPTY_VALUES;
}

Expand Down
32 changes: 0 additions & 32 deletions micrometer-tracing/src/main/java/io/micrometer/tracing/docs/EventValue.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion ...tracing/src/main/java/io/micrometer/tracing/handler/DefaultTracingObservationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package io.micrometer.tracing.handler;

import io.micrometer.common.Event;
import io.micrometer.observation.Observation;
import io.micrometer.tracing.Span;
import io.micrometer.tracing.Tracer;
Expand Down Expand Up @@ -61,7 +62,7 @@ public void onError(Observation.Context context) {
}

@Override
public void onEvent(Observation.Event event, Observation.Context context) {
public void onEvent(Event event, Observation.Context context) {
getTracingContext(context).getSpan().event(event.getContextualName());
}

Expand Down