Merge branch 'lukas/otp_mibs/deprecate/OTP-15141'

* lukas/otp_mibs/deprecate/OTP-15141: Update primary bootstrap Deprecate otp_mibs
garazdawi · Jun 15, 2018 · d6cd7d1 · d6cd7d1
2 parents 1bf3086 + 9d68fe2
commit d6cd7d1
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 2 deletions.
diff --git a/bootstrap/lib/kernel/ebin/application_controller.beam b/bootstrap/lib/kernel/ebin/application_controller.beam
diff --git a/bootstrap/lib/kernel/ebin/logger_server.beam b/bootstrap/lib/kernel/ebin/logger_server.beam
diff --git a/bootstrap/lib/kernel/ebin/net_kernel.beam b/bootstrap/lib/kernel/ebin/net_kernel.beam
diff --git a/bootstrap/lib/stdlib/ebin/gen_statem.beam b/bootstrap/lib/stdlib/ebin/gen_statem.beam
diff --git a/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam b/bootstrap/lib/stdlib/ebin/io_lib_pretty.beam
diff --git a/bootstrap/lib/stdlib/ebin/maps.beam b/bootstrap/lib/stdlib/ebin/maps.beam
diff --git a/bootstrap/lib/stdlib/ebin/otp_internal.beam b/bootstrap/lib/stdlib/ebin/otp_internal.beam
diff --git a/bootstrap/lib/stdlib/ebin/uri_string.beam b/bootstrap/lib/stdlib/ebin/uri_string.beam
diff --git a/lib/os_mon/doc/src/os_mon_mib.xml b/lib/os_mon/doc/src/os_mon_mib.xml
@@ -35,7 +35,10 @@
     <p>Functions for loading and unloading the OTP-OS-MON-MIB into/from
       an SNMP agent. The instrumentation of the OTP-OS-MON-MIB uses
       Mnesia, hence Mnesia must be started prior to loading
-      the OTP-OS-MON-MIB.</p>
+    the OTP-OS-MON-MIB.</p>
+    <warning>
+      <p>This module has been deprecated and will be removed in a furture release.</p>
+    </warning>
   </description>
   <funcs>
     <func>

diff --git a/lib/otp_mibs/doc/src/otp_mib.xml b/lib/otp_mibs/doc/src/otp_mib.xml
@@ -34,7 +34,10 @@
     <p>The SNMP application should be used to start an SNMP agent. Then
       the API functions below can be used to load/unload the OTP-MIB
       into/from the agent. The instrumentation of the OTP-MIB uses
-      Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p>
+    Mnesia, hence Mnesia must be started prior to loading the OTP-MIB.</p>
+    <warning>
+      <p>This application has been deprecated and will be removed in a furture release.</p>
+    </warning>
   </description>
   <funcs>
     <func>

diff --git a/lib/otp_mibs/src/otp_mib.erl b/lib/otp_mibs/src/otp_mib.erl
@@ -36,6 +36,9 @@
 %% Exported for internal use via rpc
 -export([get_erl_node/1, get_appls/1]).
 
+-deprecated([{load,1,eventually},
+	     {unload,1,eventually}]).
+
 %% Shadow tables
 -record(erlNodeTable,
 	{erlNodeId, erlNodeName, erlNodeMachine, erlNodeVersion,

diff --git a/lib/stdlib/src/otp_internal.erl b/lib/stdlib/src/otp_internal.erl
@@ -620,6 +620,8 @@ obsolete_1(ssl, ssl_accept, 2) ->
     {deprecated, "deprecated; use ssl:handshake/2 instead"};
 obsolete_1(ssl, ssl_accept, 3) ->
     {deprecated, "deprecated; use ssl:handshake/3 instead"};
+obsolete_1(otp_mib, F, _) when F =:= load; F =:= unload ->
+    {deprecated, "deprecated; functionality will be removed in a future release"};
 
 %% not obsolete