Skip to content

Commit fe3224c

Browse files
authored
[telemetrygen] update semconv dependencies (#38043)
This updates the semconv deps for telemetrygen and the examples. --------- Signed-off-by: Alex Boten <[email protected]>
1 parent 30f9a23 commit fe3224c

File tree

7 files changed

+37
-10
lines changed

7 files changed

+37
-10
lines changed
+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: telemetrygen
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Update attribute of generated traces from `net.peer.ip` to `net.sock.peer.addr` to bring it in line with new semconv.
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [38043]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: []

cmd/telemetrygen/pkg/logs/logs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"go.opentelemetry.io/otel/log"
1717
sdklog "go.opentelemetry.io/otel/sdk/log"
1818
"go.opentelemetry.io/otel/sdk/resource"
19-
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
19+
semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
2020
"go.uber.org/zap"
2121
"golang.org/x/time/rate"
2222

cmd/telemetrygen/pkg/traces/traces.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp"
2121
"go.opentelemetry.io/otel/sdk/resource"
2222
sdktrace "go.opentelemetry.io/otel/sdk/trace"
23-
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
23+
semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
2424
"go.uber.org/zap"
2525
"golang.org/x/time/rate"
2626

cmd/telemetrygen/pkg/traces/worker.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"go.opentelemetry.io/otel/attribute"
1616
"go.opentelemetry.io/otel/codes"
1717
"go.opentelemetry.io/otel/propagation"
18-
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
18+
semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
1919
"go.opentelemetry.io/otel/trace"
2020
"go.uber.org/zap"
2121
"golang.org/x/time/rate"
@@ -55,8 +55,8 @@ func (w worker) simulateTraces(telemetryAttributes []attribute.KeyValue) {
5555
}
5656

5757
ctx, sp := tracer.Start(context.Background(), "lets-go", trace.WithAttributes(
58-
semconv.NetPeerIPKey.String(fakeIP),
59-
semconv.PeerServiceKey.String("telemetrygen-server"),
58+
semconv.NetSockPeerAddr(fakeIP),
59+
semconv.PeerService("telemetrygen-server"),
6060
),
6161
trace.WithSpanKind(trace.SpanKindClient),
6262
trace.WithTimestamp(spanStart),
@@ -83,8 +83,8 @@ func (w worker) simulateTraces(telemetryAttributes []attribute.KeyValue) {
8383
}
8484

8585
_, child := tracer.Start(childCtx, "okey-dokey-"+strconv.Itoa(j), trace.WithAttributes(
86-
semconv.NetPeerIPKey.String(fakeIP),
87-
semconv.PeerServiceKey.String("telemetrygen-client"),
86+
semconv.NetSockPeerAddr(fakeIP),
87+
semconv.PeerService("telemetrygen-client"),
8888
),
8989
trace.WithSpanKind(trace.SpanKindServer),
9090
trace.WithTimestamp(spanStart),

examples/demo/client/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
2727
"go.opentelemetry.io/otel/sdk/resource"
2828
sdktrace "go.opentelemetry.io/otel/sdk/trace"
29-
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
29+
semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
3030
)
3131

3232
// Initializes an OTLP exporter, and configures the corresponding trace and

examples/demo/server/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
sdkmetric "go.opentelemetry.io/otel/sdk/metric"
2626
"go.opentelemetry.io/otel/sdk/resource"
2727
sdktrace "go.opentelemetry.io/otel/sdk/trace"
28-
semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
28+
semconv "go.opentelemetry.io/otel/semconv/v1.25.0"
2929
"go.opentelemetry.io/otel/trace"
3030
)
3131

examples/secure-tracing/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ secure-tracing-otel-collector-1 | Name : okey-dokey
106106
secure-tracing-otel-collector-1 | Kind : Server
107107
...
108108
secure-tracing-otel-collector-1 | Attributes:
109-
secure-tracing-otel-collector-1 | -> net.peer.ip: Str(1.2.3.4)
109+
secure-tracing-otel-collector-1 | -> net.sock.peer.addr: Str(1.2.3.4)
110110
secure-tracing-otel-collector-1 | -> peer.service: Str(telemetrygen-client)
111111
...
112112

0 commit comments

Comments
 (0)