Skip to content

Commit d0797f9

Browse files
committed
correct usage of Resource class and attributes in examples
1 parent e01fa0c commit d0797f9

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

docs/examples/basic_tracer/resources.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
# limitations under the License.
1414

1515
from opentelemetry import trace
16-
from opentelemetry.sdk.resources import Resource
16+
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
1717
from opentelemetry.sdk.trace import TracerProvider
1818
from opentelemetry.sdk.trace.export import (
1919
BatchSpanProcessor,
2020
ConsoleSpanExporter,
2121
)
2222

2323
# Use Resource.create() instead of constructor directly
24-
resource = Resource.create({"service.name": "basic_service"})
24+
resource = Resource.create({SERVICE_NAME: "basic_service"})
2525

2626
trace.set_tracer_provider(TracerProvider(resource=resource))
2727

docs/examples/fork-process-model/README.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gunicorn post_fork hook
1717
1818
from opentelemetry import trace
1919
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
20-
from opentelemetry.sdk.resources import Resource
20+
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
2121
from opentelemetry.sdk.trace import TracerProvider
2222
from opentelemetry.sdk.trace.export import BatchSpanProcessor
2323
@@ -26,7 +26,7 @@ Gunicorn post_fork hook
2626
server.log.info("Worker spawned (pid: %s)", worker.pid)
2727
2828
resource = Resource.create(attributes={
29-
"service.name": "api-service"
29+
SERVICE_NAME: "api-service"
3030
})
3131
3232
trace.set_tracer_provider(TracerProvider(resource=resource))
@@ -45,15 +45,15 @@ uWSGI postfork decorator
4545
4646
from opentelemetry import trace
4747
from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
48-
from opentelemetry.sdk.resources import Resource
48+
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
4949
from opentelemetry.sdk.trace import TracerProvider
5050
from opentelemetry.sdk.trace.export import BatchSpanProcessor
5151
5252
5353
@postfork
5454
def init_tracing():
5555
resource = Resource.create(attributes={
56-
"service.name": "api-service"
56+
SERVICE_NAME: "api-service"
5757
})
5858
5959
trace.set_tracer_provider(TracerProvider(resource=resource))

docs/examples/fork-process-model/flask-gunicorn/gunicorn.conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
)
2222
from opentelemetry.sdk.metrics import MeterProvider
2323
from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
24-
from opentelemetry.sdk.resources import Resource
24+
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
2525
from opentelemetry.sdk.trace import TracerProvider
2626
from opentelemetry.sdk.trace.export import BatchSpanProcessor
2727

@@ -48,7 +48,7 @@ def post_fork(server, worker):
4848

4949
resource = Resource.create(
5050
attributes={
51-
"service.name": "api-service",
51+
SERVICE_NAME: "api-service",
5252
# If workers are not distinguished within attributes, traces and
5353
# metrics exported from each worker will be indistinguishable. While
5454
# not necessarily an issue for traces, it is confusing for almost

docs/examples/fork-process-model/flask-uwsgi/app.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
OTLPSpanExporter,
2222
)
2323
from opentelemetry.instrumentation.flask import FlaskInstrumentor
24-
from opentelemetry.sdk.resources import Resource
24+
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
2525
from opentelemetry.sdk.trace import TracerProvider
2626
from opentelemetry.sdk.trace.export import BatchSpanProcessor
2727

@@ -34,7 +34,7 @@
3434

3535
@postfork
3636
def init_tracing():
37-
resource = Resource.create(attributes={"service.name": "api-service"})
37+
resource = Resource.create(attributes={SERVICE_NAME: "api-service"})
3838

3939
trace.set_tracer_provider(TracerProvider(resource=resource))
4040
# This uses insecure connection for the purpose of example. Please see the

docs/examples/logs/example.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
)
88
from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
99
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
10-
from opentelemetry.sdk.resources import Resource
10+
from opentelemetry.sdk.resources import (
11+
SERVICE_INSTANCE_ID,
12+
SERVICE_NAME,
13+
Resource,
14+
)
1115
from opentelemetry.sdk.trace import TracerProvider
1216
from opentelemetry.sdk.trace.export import (
1317
BatchSpanProcessor,
@@ -22,8 +26,8 @@
2226
logger_provider = LoggerProvider(
2327
resource=Resource.create(
2428
{
25-
"service.name": "shoppingcart",
26-
"service.instance.id": "instance-12",
29+
SERVICE_NAME: "shoppingcart",
30+
SERVICE_INSTANCE_ID: "instance-12",
2731
}
2832
),
2933
)

0 commit comments

Comments
 (0)