Skip to content

Commit bf8eff6

Browse files
committed
fixed all the examples with incorrect Resource creationalso resolved the requested changes
1 parent e2c1794 commit bf8eff6

File tree

6 files changed

+21
-17
lines changed

6 files changed

+21
-17
lines changed

docs/examples/basic_tracer/resources.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,16 @@
1313
# limitations under the License.
1414

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

2324
# Use Resource.create() instead of constructor directly
24-
resource = Resource.create({SERVICE_NAME: "basic_service"})
25+
resource = Resource.create({ResourceAttributes.SERVICE_NAME: "basic_service"})
2526

2627
trace.set_tracer_provider(TracerProvider(resource=resource))
2728

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,16 @@ 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 SERVICE_NAME, Resource
48+
from opentelemetry.sdk.resources import Resource
49+
from opentelemetry.semconv.resource import ResourceAttributes
4950
from opentelemetry.sdk.trace import TracerProvider
5051
from opentelemetry.sdk.trace.export import BatchSpanProcessor
5152
5253
5354
@postfork
5455
def init_tracing():
5556
resource = Resource.create(attributes={
56-
SERVICE_NAME: "api-service"
57+
ResourceAttributes.SERVICE_NAME: "api-service"
5758
})
5859
5960
trace.set_tracer_provider(TracerProvider(resource=resource))

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
)
2222
from opentelemetry.sdk.metrics import MeterProvider
2323
from opentelemetry.sdk.metrics.export import PeriodicExportingMetricReader
24-
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
24+
from opentelemetry.sdk.resources import Resource
2525
from opentelemetry.sdk.trace import TracerProvider
2626
from opentelemetry.sdk.trace.export import BatchSpanProcessor
27+
from opentelemetry.semconv.resource import ResourceAttributes
2728

2829
bind = "127.0.0.1:8000"
2930

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

4950
resource = Resource.create(
5051
attributes={
51-
SERVICE_NAME: "api-service",
52+
ResourceAttributes.SERVICE_NAME: "api-service",
5253
# If workers are not distinguished within attributes, traces and
5354
# metrics exported from each worker will be indistinguishable. While
5455
# not necessarily an issue for traces, it is confusing for almost

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@
2121
OTLPSpanExporter,
2222
)
2323
from opentelemetry.instrumentation.flask import FlaskInstrumentor
24-
from opentelemetry.sdk.resources import SERVICE_NAME, Resource
24+
from opentelemetry.sdk.resources import Resource
2525
from opentelemetry.sdk.trace import TracerProvider
2626
from opentelemetry.sdk.trace.export import BatchSpanProcessor
27+
from opentelemetry.semconv.resource import ResourceAttributes
2728

2829
application = flask.Flask(__name__)
2930

@@ -34,7 +35,9 @@
3435

3536
@postfork
3637
def init_tracing():
37-
resource = Resource.create(attributes={SERVICE_NAME: "api-service"})
38+
resource = Resource.create(
39+
attributes={ResourceAttributes.SERVICE_NAME: "api-service"}
40+
)
3841

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

docs/examples/logs/example.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@
77
)
88
from opentelemetry.sdk._logs import LoggerProvider, LoggingHandler
99
from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
10-
from opentelemetry.sdk.resources import (
11-
SERVICE_INSTANCE_ID,
12-
SERVICE_NAME,
13-
Resource,
14-
)
10+
from opentelemetry.sdk.resources import Resource
1511
from opentelemetry.sdk.trace import TracerProvider
1612
from opentelemetry.sdk.trace.export import (
1713
BatchSpanProcessor,
1814
ConsoleSpanExporter,
1915
)
16+
from opentelemetry.semconv.resource import ResourceAttributes
2017

2118
trace.set_tracer_provider(TracerProvider())
2219
trace.get_tracer_provider().add_span_processor(
@@ -26,8 +23,8 @@
2623
logger_provider = LoggerProvider(
2724
resource=Resource.create(
2825
{
29-
SERVICE_NAME: "shoppingcart",
30-
SERVICE_INSTANCE_ID: "instance-12",
26+
ResourceAttributes.SERVICE_NAME: "shoppingcart",
27+
ResourceAttributes.SERVICE_INSTANCE_ID: "instance-12",
3128
}
3229
),
3330
)

docs/examples/opencensus-shim/app.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,16 @@
2525
from opentelemetry.sdk.resources import Resource
2626
from opentelemetry.sdk.trace import TracerProvider
2727
from opentelemetry.sdk.trace.export import BatchSpanProcessor
28+
from opentelemetry.semconv.resource import ResourceAttributes
2829
from opentelemetry.shim.opencensus import install_shim
2930

3031
DB = "example.db"
3132

3233
# Set up OpenTelemetry
3334
tracer_provider = TracerProvider(
34-
resource=Resource(
35+
resource=Resource.create(
3536
{
36-
"service.name": "opencensus-shim-example-flask",
37+
ResourceAttributes.SERVICE_NAME: "opencensus-shim-example-flask",
3738
}
3839
)
3940
)

0 commit comments

Comments
 (0)