diff --git a/docs/examples/basic_tracer/resources.py b/docs/examples/basic_tracer/resources.py index 87853a8f66b..ad26430d75d 100644 --- a/docs/examples/basic_tracer/resources.py +++ b/docs/examples/basic_tracer/resources.py @@ -19,9 +19,10 @@ BatchSpanProcessor, ConsoleSpanExporter, ) +from opentelemetry.semconv.resource import ResourceAttributes # Use Resource.create() instead of constructor directly -resource = Resource.create({"service.name": "basic_service"}) +resource = Resource.create({ResourceAttributes.SERVICE_NAME: "basic_service"}) trace.set_tracer_provider(TracerProvider(resource=resource)) diff --git a/docs/examples/fork-process-model/README.rst b/docs/examples/fork-process-model/README.rst index 2f33bcf500a..d94d8539ec5 100644 --- a/docs/examples/fork-process-model/README.rst +++ b/docs/examples/fork-process-model/README.rst @@ -20,13 +20,14 @@ Gunicorn post_fork hook from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor + from opentelemetry.semconv.resource import ResourceAttributes def post_fork(server, worker): server.log.info("Worker spawned (pid: %s)", worker.pid) resource = Resource.create(attributes={ - "service.name": "api-service" + ResourceAttributes.SERVICE_NAME: "api-service" }) trace.set_tracer_provider(TracerProvider(resource=resource)) @@ -46,6 +47,7 @@ uWSGI postfork decorator from opentelemetry import trace from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter from opentelemetry.sdk.resources import Resource + from opentelemetry.semconv.resource import ResourceAttributes from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor @@ -53,7 +55,7 @@ uWSGI postfork decorator @postfork def init_tracing(): resource = Resource.create(attributes={ - "service.name": "api-service" + ResourceAttributes.SERVICE_NAME: "api-service" }) trace.set_tracer_provider(TracerProvider(resource=resource)) diff --git a/docs/examples/fork-process-model/flask-gunicorn/gunicorn.conf.py b/docs/examples/fork-process-model/flask-gunicorn/gunicorn.conf.py index 34b4591596c..11ad901957a 100644 --- a/docs/examples/fork-process-model/flask-gunicorn/gunicorn.conf.py +++ b/docs/examples/fork-process-model/flask-gunicorn/gunicorn.conf.py @@ -24,6 +24,7 @@ from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor +from opentelemetry.semconv.resource import ResourceAttributes bind = "127.0.0.1:8000" @@ -48,7 +49,7 @@ def post_fork(server, worker): resource = Resource.create( attributes={ - "service.name": "api-service", + ResourceAttributes.SERVICE_NAME: "api-service", # If workers are not distinguished within attributes, traces and # metrics exported from each worker will be indistinguishable. While # not necessarily an issue for traces, it is confusing for almost diff --git a/docs/examples/fork-process-model/flask-uwsgi/app.py b/docs/examples/fork-process-model/flask-uwsgi/app.py index 1191bcc30e0..4b0674ec742 100644 --- a/docs/examples/fork-process-model/flask-uwsgi/app.py +++ b/docs/examples/fork-process-model/flask-uwsgi/app.py @@ -24,6 +24,7 @@ from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor +from opentelemetry.semconv.resource import ResourceAttributes application = flask.Flask(__name__) @@ -34,7 +35,9 @@ @postfork def init_tracing(): - resource = Resource.create(attributes={"service.name": "api-service"}) + resource = Resource.create( + attributes={ResourceAttributes.SERVICE_NAME: "api-service"} + ) trace.set_tracer_provider(TracerProvider(resource=resource)) # This uses insecure connection for the purpose of example. Please see the diff --git a/docs/examples/logs/example.py b/docs/examples/logs/example.py index c782d457533..955eaea9e26 100644 --- a/docs/examples/logs/example.py +++ b/docs/examples/logs/example.py @@ -13,6 +13,7 @@ BatchSpanProcessor, ConsoleSpanExporter, ) +from opentelemetry.semconv.resource import ResourceAttributes trace.set_tracer_provider(TracerProvider()) trace.get_tracer_provider().add_span_processor( @@ -22,8 +23,8 @@ logger_provider = LoggerProvider( resource=Resource.create( { - "service.name": "shoppingcart", - "service.instance.id": "instance-12", + ResourceAttributes.SERVICE_NAME: "shoppingcart", + ResourceAttributes.SERVICE_INSTANCE_ID: "instance-12", } ), ) diff --git a/docs/examples/opencensus-shim/app.py b/docs/examples/opencensus-shim/app.py index 9103ba53337..95f97d5acb5 100644 --- a/docs/examples/opencensus-shim/app.py +++ b/docs/examples/opencensus-shim/app.py @@ -25,15 +25,16 @@ from opentelemetry.sdk.resources import Resource from opentelemetry.sdk.trace import TracerProvider from opentelemetry.sdk.trace.export import BatchSpanProcessor +from opentelemetry.semconv.resource import ResourceAttributes from opentelemetry.shim.opencensus import install_shim DB = "example.db" # Set up OpenTelemetry tracer_provider = TracerProvider( - resource=Resource( + resource=Resource.create( { - "service.name": "opencensus-shim-example-flask", + ResourceAttributes.SERVICE_NAME: "opencensus-shim-example-flask", } ) )