Skip to content

Commit 7359a23

Browse files
committed
Fix some visual issues with spans.
1 parent 6c00664 commit 7359a23

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.2
1+
0.2.3

shard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: opentelemetry-instrumentation
2-
version: 0.2.2
2+
version: 0.2.3
33

44
authors:
55
- Kirk Haines <[email protected]>

spec/instrumentation/crystal_http_server_spec.cr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ describe HTTP::Server, tags: ["HTTP::Server"] do
6060
traces[0]["resource"]["service.version"].should eq "1.0.0"
6161
traces[0]["spans"][0]["attributes"]["net.peer.ip"].should eq "127.0.0.1"
6262

63-
traces[1]["spans"][0]["name"].should eq "HTTP Request Received"
63+
traces[1]["spans"][0]["name"].should eq "GET /"
6464
traces[1]["spans"][0]["attributes"]["http.method"].should eq "GET"
6565
traces[1]["spans"][0]["attributes"]["http.scheme"].should eq "http"
6666

src/opentelemetry/instrumentation/crystal/http_server.cr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,10 @@ unless_enabled?("OTEL_CRYSTAL_DISABLE_INSTRUMENTATION_HTTP_SERVER") do
104104
max_headers_size: max_headers_size,
105105
)
106106

107+
break unless request
107108
trace = OpenTelemetry.trace
108-
trace.in_span("HTTP Request Received") do |span|
109-
# EOF
110-
break unless request
111-
109+
trace_name = request.is_a?(HTTP::Request) ? "#{request.method} #{request.path}" : "ERROR #{request.code}"
110+
trace.in_span(trace_name) do |span|
112111
response.reset
113112

114113
if request.is_a?(HTTP::Status)
@@ -171,6 +170,7 @@ unless_enabled?("OTEL_CRYSTAL_DISABLE_INSTRUMENTATION_HTTP_SERVER") do
171170
return
172171
end
173172
end
173+
break unless request
174174
break unless request.as(HTTP::Request).keep_alive?
175175

176176
# Don't continue if the handler set `Connection` header to `close`

0 commit comments

Comments
 (0)